Support transfers with 24h validity period

[ci]

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

Author: cocreature

daml/dars.lock

@@ -6,7 +6,7 @@ splice-amulet 0.1.12 95a88ff9ffd509e097802ecf3bbd58c83a5dff408e439cca4e2105ebd2c
 splice-amulet 0.1.13 6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c
 splice-amulet 0.1.14 3ca1343ab26b453d38c8adb70dca5f1ead8440c42b59b68f070786955cbf9ec1
 splice-amulet 0.1.15 67fac2f853bce8dbf0b9817bb5ba7c59f10e8120b7c808696f7010e5f0c8a791
-splice-amulet 0.1.16 2e91a702709b7732622ecab5e93639c7e6d1de1170e00e711ba0588b21db84c5
+splice-amulet 0.1.16 11af68d7ba6a71669b580f32db5969fad97d96d331f233cba6e817bc4c4c9d7f
 splice-amulet 0.1.2 1446ffdf23326cef2de97923df96618eb615792bea36cf1431f03639448f1645
 splice-amulet 0.1.3 0d89016d5a90eb8bced48bbac99e81c57781b3a36094b8d48b8e4389851e19af
 splice-amulet 0.1.4 a36ef8888fb44caae13d96341ce1fabd84fc9e2e7b209bbc3caabb48b6be1668
@@ -24,7 +24,7 @@ splice-amulet-name-service 0.1.13 0e8c7e1cb828336bb4d537f6c4ecd94128b94733eb2ae1
 splice-amulet-name-service 0.1.14 6cb1318176e758c256c2e385f87b86c5060e80fb68a72e8ceb08ac5f9045fff2
 splice-amulet-name-service 0.1.15 d4724b90dce9fb08badbb367962d237710b3a603e4f57806a1b0af308cc70fdb
 splice-amulet-name-service 0.1.16 53468a38bce11b51cd2ed10b9c09301c0b73570b50896d5649c4629de15815a3
-splice-amulet-name-service 0.1.17 7f52d2767c3be8b9df96582fa5dfd8a357699c255d46b9dffd96830c76843d84
+splice-amulet-name-service 0.1.17 4c8955c3a0657427ed0d84e41eb7c232676f6705353a2deca1348a54f54e1589
 splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b92f066c865dbdeeabb
 splice-amulet-name-service 0.1.3 beb4b85f3f0cf36dfb93fc917d3ac218ee5d41b6e70604720cb228d85e168ee0
 splice-amulet-name-service 0.1.4 053c7f4c2a77312e7d465a4fa7dc8cb298754ad12c0c987a7c401bd724e65efc
@@ -33,8 +33,8 @@ 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.20 6eef1b7632b383a6c9810bb0cd78a0bc491021989d25f813ec5579d8cae0706d
-splice-amulet-test 0.1.19 1c64fdca4f39737f835329af4f3b74bbf243322170b6753f654b61c6b1447369
+splice-amulet-name-service-test 0.1.20 365f889e0d77c47f8ab2b106aaf3690d429112d36e84ae53d988e2451b94ef20
+splice-amulet-test 0.1.19 41f260a08c5d8107335030d1352a9fa5ff53f9521dbedacc0702139f53c11881
 splice-api-featured-app-v1 1.0.0 7804375fe5e4c6d5afe067bd314c42fe0b7d005a1300019c73154dd939da4dda
 splice-api-token-allocation-instruction-v1 1.0.0 275064aacfe99cea72ee0c80563936129563776f67415ef9f13e4297eecbc520
 splice-api-token-allocation-request-v1 1.0.0 6fe848530b2404017c4a12874c956ad7d5c8a419ee9b040f96b5c13172d2e193
@@ -60,16 +60,16 @@ splice-dso-governance 0.1.19 759d1cf002fc1225ac43a55d73f0058becce3e62cfb5485c197
 splice-dso-governance 0.1.2 4206e127be8b111ac84bd7f98bd9dbf03ed489f1642b46ab31a46ee6d688e7e8
 splice-dso-governance 0.1.20 996a3b619d6b65ca7812881978c44c650cac119de78f5317d1f317658943001c
 splice-dso-governance 0.1.21 2d306cfe8cdb3daf2d21f84dfecc3e2f26a41504e58fe25cb7fe5cc65683d11f
-splice-dso-governance 0.1.22 180ec0980e3498d6297cf40028584b7a807f9a0dcb05f44f5c5d9fd62744a053
+splice-dso-governance 0.1.22 87542c2eb054826afd3988a3eb253c3b4f281a1fa9317ee0d5fbb1f6bedaa01f
 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.26 cff06b6cd81ec8134a44eee577c1f5934bd279528b51811194a92b918347ff7f
-splice-token-standard-test 1.0.10 02825979e9e77085a44f4c0fa6535608c5f2249d1ece294b0e27aa1195b99741
+splice-dso-governance-test 0.1.26 4a9142c176e8049e72e9bba5efd2420993a763422ed65be1200630fbb3ddfa82
+splice-token-standard-test 1.0.10 903599e34241a5f939cf6d502ff80d785052d494d29f0fc0d43117ad2456b87d
 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
@@ -83,9 +83,9 @@ splice-util-featured-app-proxies 1.0.0 48e0c4fe4ea05e3b740404ebe37004ddd741efbdc
 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-test 1.0.8 093646f34eb9c82cddb3ec05f86928574ad5ceb24a2706ec4ccb6bd686d99b81
+splice-util-featured-app-proxies-test 1.0.8 6ec3ff29ad8460f8c5aaa144e9f86044ab58ec710753edc6de2d4698df0c6151
 splice-util-token-standard-wallet 1.0.0 1da198cb7968fa478cfa12aba9fdf128a63a8af6ab284ea6be238cf92a3733ac
-splice-util-token-standard-wallet-test 1.0.3 eb60a40f9b3e3124566b97c060cdbc5c1ce1215846c9f1a0a07067d506a0977a
+splice-util-token-standard-wallet-test 1.0.3 7cf47e57fbc4c724bc702d9f39a891a94d8f4ace413ec21c68dd985cced1a657
 splice-validator-lifecycle 0.1.0 cef96fac957362f1fc097120bd13686cac7f84fbc8053afa994a1f9214d9570c
 splice-validator-lifecycle 0.1.1 1ddf05c96002914593c929848b786f34c753fb0be07717d1786be177a564aada
 splice-validator-lifecycle 0.1.2 57e2f15f9755db1f00e51c52c319294264a21ad71c6bc1e7cd70db4b164c0aaa
@@ -102,7 +102,7 @@ splice-wallet 0.1.12 b30bb727552cf6b624dbc9a5ff95f6c158e0a654e2e9c5c27bcfe3f5d0f
 splice-wallet 0.1.13 eb6e01efacc3397e23c6be8b9be7db4bf37672211974d69e24b48980e2f98b7e
 splice-wallet 0.1.14 690c1d47bac06db419db344d59a7a30c53fa3f5d961943fe1782cfc6c78794d8
 splice-wallet 0.1.15 fd57252dda29e3ce90028114c91b521cb661df5a9d6e87c41a9e91518215fa5b
-splice-wallet 0.1.16 a940e07b593b6d6ca8ec4f0f4f1b7483e371265d53362f5e9af054b2a5c50fc3
+splice-wallet 0.1.16 4597d88be5edc4a93de4467485c23f13b4b3816f816de8191a702438488d8564
 splice-wallet 0.1.2 c162e08a4ec0428bfa870b6d9040989e575c74199c3a80558c62e03196dd5146
 splice-wallet 0.1.3 2c35bb4f5084ea66db59717d21750bfd64c43147ef5fd5166615092d592a6917
 splice-wallet 0.1.4 141dad2d33b6410b8e1c35a0c4f8f76cb691e4d9a4410ce89f33f373855317e1
@@ -119,7 +119,7 @@ splice-wallet-payments 0.1.12 88516902a9f045d3fd3835c8f5c8c6bfe4b44d83fae1136924
 splice-wallet-payments 0.1.13 0b9250642d3864e6bbea553264dcac0d286104f24efad2fbaf4645520bcb4053
 splice-wallet-payments 0.1.14 45b29d6e05b5352c39edde850c66b4535c682b9991b06eec312176b1a48ecab5
 splice-wallet-payments 0.1.15 f80fae7a9de9431854372a66c3ca78675f77b2f54ede65abdc1b1abdec707d21
-splice-wallet-payments 0.1.16 11ca4e7f82adca52a5baba4c4740626e9b5d7d91f6d770a44436e563814a350b
+splice-wallet-payments 0.1.16 6964c8296868adcaa8c0245b609a2b2bc170fff0fc26443ce44fd44e30495578
 splice-wallet-payments 0.1.2 775f5eb9c0249509adda5eb3ea4ee31bb953601168c18880df6f2ff09ec4298a
 splice-wallet-payments 0.1.3 b953b3729c81a55e598a364be7d0c0574750df3de12a7a1b53a300f217cb5c5c
 splice-wallet-payments 0.1.4 12177f54873c1094ea169874ad0d7838383fd137f302d16356e93f28dfbc0fcc
@@ -128,7 +128,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.19 386f89f31515ae35866d12bc57dc7f6268165915dc3ade96dfa81676a9662fa8
+splice-wallet-test 0.1.19 fb76bf793f9e2e8e92d87c1d5deb5936a3c1bdcd0901c56b9b44ee348e4cfa0c
 splitwell 0.1.0 075c76de553ab88383a7c69de134afa82aacfdf8ea8fcfe8852c4b199c3b2669
 splitwell 0.1.1 ccb1a0215053062202052e1a052f9214da3fdae5253a6d43e2e155ff4f57fe75
 splitwell 0.1.10 d42676a366f7ca7a2409974dd3054aa4d83ab29baa3b2086ad021407b0a1a295
@@ -137,7 +137,7 @@ splitwell 0.1.12 cc047977ee8da70e858f203a14c3fd302c6aaed27be42383e61a026854d7611
 splitwell 0.1.13 c2cf7b5fb3c615cdd2c8e14af42f1ca5fe4df8647cb656c7d02a72420152c3dd
 splitwell 0.1.14 bf2ec3fec9bcb58ed5e2ff63072a1e4994d0415ea7a0275942be282906a42021
 splitwell 0.1.15 2f3d8a50f57e66af450c36556a09d04c1d9117b699720118b7bd302556805499
-splitwell 0.1.16 27652a3a292d7bcbe7e4c795ee10748f0519d9d433c075b426c91df90f275b85
+splitwell 0.1.16 f6d4a402672b95f95d58e68f410b3de73297ff9d09c61a1051d89bab238b58e3
 splitwell 0.1.2 778edd2c228c6b68198d4d033885b2d0dae7daaee55d7df3edd9dfdf1f10fbd0
 splitwell 0.1.3 7cde068cde689584f86a2499689d5cb165264d96496721e24ac6fb909f770a58
 splitwell 0.1.4 85557b86cd4f330f093915db1ea26eac5092de6b5ddae0690146f6059c89419b
@@ -146,4 +146,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.19 37cafd5988552e48ae5dfd17e2a192eb8d165ae4dcaf1ddb0589c9ac49090aed
+splitwell-test 0.1.19 1efc234eb0f6c60d96f58dc346160f0a9bd50cd00982945d2b1dfbbe6e3c4489

daml/dars/splice-amulet-0.1.16.dar

@@ -11,14 +11,16 @@ import Splice.ValidatorLicense
 
 import Splice.Scripts.Util
 
+import Splice.Testing.Registries.AmuletRegistry (advanceToNextRoundChange)
+
 -- | Note to readers: try commenting suffixes of this script out to
 -- see the various steps in action.
 testAmuletBurn : Script ()
 testAmuletBurn = do
   -- bootstrap app
   app <- setupApp
 
-  advanceToNextRoundChange app
+  advanceToNextRoundChange app.dso
 
   -- -- start issuing
   runNextIssuance app

daml/dars/splice-amulet-name-service-0.1.17.dar

@@ -19,6 +19,7 @@ import Splice.AmuletRules
 import Splice.Expiry
 import Splice.Fees
 import Splice.Testing.Registries.AmuletRegistry.Parameters
+import Splice.Testing.Registries.AmuletRegistry (convertAllFeaturedAppActivityMarkers)
 import Splice.Scripts.Util
 
 testUsageFees: Script ()
@@ -467,6 +468,8 @@ testAppRewardBeneficiaries = do
       context = context.context
       expectedDso = Some app.dso
 
+    convertAllFeaturedAppActivityMarkers app.dso
+
     if featured
       then do
         [(rewardCid, aliceAppRewardCouponUnfeaturedNoBeneficiary)] <- query @AppRewardCoupon alice.primaryParty
@@ -492,6 +495,8 @@ testAppRewardBeneficiaries = do
             context = context.context
             expectedDso = Some app.dso
 
+        convertAllFeaturedAppActivityMarkers app.dso
+
         [(rewardCid1, aliceAppRewardCouponUnfeaturedBeneficiary)] <- queryFilter @AppRewardCoupon alice.primaryParty (\r -> r.beneficiary == Some alice.primaryParty)
 
         [(rewardCid2, bobAppRewardCouponUnfeaturedBeneficiary)] <- queryFilter @AppRewardCoupon bob.primaryParty (\r -> r.beneficiary == Some bob.primaryParty)

daml/dars/splice-dso-governance-0.1.22.dar

@@ -4,6 +4,7 @@
 module Splice.Scripts.TestComputeFees where
 
 import DA.Assert
+import DA.Time
 import DA.TextMap as TextMap
 import Daml.Script
 
@@ -46,10 +47,16 @@ testScaledHoldingFees = do
 
   -- skip 202 rounds so that the amulet expires
   skipNRounds app 202
+  -- advance external party config state contracts to current
+  -- rounds
+  updateExternalPartyConfigState app
+  passTime (hours 24)
+  updateExternalPartyConfigState app
 
-  openRoundCid <- getLatestActiveOpenRound app
-  result <- submit app.dso $ exerciseCmd curAmuletCid Amulet_Expire with
-    roundCid = openRoundCid._1
+  (config0Cid, config1Cid) <- getExternalPartyConfigStates app
+  result <- submit app.dso $ exerciseCmd curAmuletCid Amulet_ExpireV2 with
+    externalPartyConfigState0Cid = config0Cid
+    externalPartyConfigState1Cid = config1Cid
 
   -- Check the expire result. In particular, actual holding fee should be based
   -- on the amulet price when the amulet was created, not the current one.
@@ -58,7 +65,7 @@ testScaledHoldingFees = do
         round = curAmulet.amount.createdAt
         changeToInitialAmountAsOfRoundZero = negate (getValueAsOfRound0 curAmulet.amount)
         changeToHoldingFeesRate = negate scaledHoldingFee
-      expectedMeta = Some $ Metadata $ TextMap.fromList
+      expectedMeta = Metadata $ TextMap.fromList
         [ ("splice.lfdecentralizedtrust.org/burned", show curAmulet.amount.initialAmount)
         , ("splice.lfdecentralizedtrust.org/tx-kind","expire-dust")
         ]