Support transfers with 24h validity period

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

Author: cocreature

daml/dars.lock

@@ -5,7 +5,7 @@ splice-amulet 0.1.11 9824927cdb455f833867b74c01cffcd8cb8cc5edd4d2273cea1329b708e
 splice-amulet 0.1.12 95a88ff9ffd509e097802ecf3bbd58c83a5dff408e439cca4e2105ebd2cd0760
 splice-amulet 0.1.13 6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c
 splice-amulet 0.1.14 3ca1343ab26b453d38c8adb70dca5f1ead8440c42b59b68f070786955cbf9ec1
-splice-amulet 0.1.15 becac25fb1aae27eb95c51a9e280b96bd5d4dad3d0355165218b146fe206b79c
+splice-amulet 0.1.15 a2d29d04133b98c53c80e7e40cf7a130fcf1d94b4cd15117fe6131aadaac64df
 splice-amulet 0.1.2 1446ffdf23326cef2de97923df96618eb615792bea36cf1431f03639448f1645
 splice-amulet 0.1.3 0d89016d5a90eb8bced48bbac99e81c57781b3a36094b8d48b8e4389851e19af
 splice-amulet 0.1.4 a36ef8888fb44caae13d96341ce1fabd84fc9e2e7b209bbc3caabb48b6be1668
@@ -22,7 +22,7 @@ splice-amulet-name-service 0.1.12 557a74491324790b5cf5a379f2481ab1cd2c8b75530858
 splice-amulet-name-service 0.1.13 0e8c7e1cb828336bb4d537f6c4ecd94128b94733eb2ae1f55b5962757d357b4b
 splice-amulet-name-service 0.1.14 6cb1318176e758c256c2e385f87b86c5060e80fb68a72e8ceb08ac5f9045fff2
 splice-amulet-name-service 0.1.15 d4724b90dce9fb08badbb367962d237710b3a603e4f57806a1b0af308cc70fdb
-splice-amulet-name-service 0.1.16 afe997d1ab610b30543608f37f00ea3eaf197896ce258dcd7057354c0bda8dd1
+splice-amulet-name-service 0.1.16 13e43c028d895f25fce529f792df03a2e40eb624129eeb045beaca65a12eac84
 splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b92f066c865dbdeeabb
 splice-amulet-name-service 0.1.3 beb4b85f3f0cf36dfb93fc917d3ac218ee5d41b6e70604720cb228d85e168ee0
 splice-amulet-name-service 0.1.4 053c7f4c2a77312e7d465a4fa7dc8cb298754ad12c0c987a7c401bd724e65efc
@@ -31,8 +31,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.19 29b528c083fff7a59ef40d1134a4d6794b635b05eaf7dd9d22b01d331e166fa8
-splice-amulet-test 0.1.18 42d4d541be52509d3fb067abf75862abf58f0ba23666588e3c14b60a1b2915dd
+splice-amulet-name-service-test 0.1.19 43f19a18abadcf1464af204175fdbfcbdb67e263f4c6eaf35fdb90b9ca42450b
+splice-amulet-test 0.1.18 9a3dcb8634c7c7fc6dc8fef9017b7d6b816b42d0754d172b0dc5778c9e4eb839
 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
@@ -57,16 +57,16 @@ splice-dso-governance 0.1.18 136484875714fcf24c24858e1d573ac756524eeb607c26999fc
 splice-dso-governance 0.1.19 759d1cf002fc1225ac43a55d73f0058becce3e62cfb5485c197f2b69ed8d9d98
 splice-dso-governance 0.1.2 4206e127be8b111ac84bd7f98bd9dbf03ed489f1642b46ab31a46ee6d688e7e8
 splice-dso-governance 0.1.20 996a3b619d6b65ca7812881978c44c650cac119de78f5317d1f317658943001c
-splice-dso-governance 0.1.21 220d9a354e41ca22e0d9d3404e06e4a47a41e175b91be7089c7924c072bc9faa
+splice-dso-governance 0.1.21 bc20296474b1c365be87e3940c2cf071d9c4b202c2bd829406b0a8010d65cedd
 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.25 5d771f99e30c92aecb440e5b9661dedd874f7187bd615c709040eb8a2e3cd448
-splice-token-standard-test 1.0.9 38967558fe135ee334de81b8babf5fc69e437955e95ff828379d9c145c1a1bec
+splice-dso-governance-test 0.1.25 ab842d999b70d0e921e5c282bbc51f1a2307294f56c9623f8ee5f8dbcd5cbce3
+splice-token-standard-test 1.0.9 c174e2bcb617f1a0501c6d79d44882c4d2825d4e9ecd30fc4dedcc557b5c558d
 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
@@ -79,9 +79,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.7 44f0eeb89d90fa4e55a8846967fd8a36ee54995def38e799fafcd4f07c0f5566
+splice-util-featured-app-proxies-test 1.0.7 0cd5833e7f4a3f10c4b60005722344d9a7447fa0772f101265b208705336f5df
 splice-util-token-standard-wallet 1.0.0 1da198cb7968fa478cfa12aba9fdf128a63a8af6ab284ea6be238cf92a3733ac
-splice-util-token-standard-wallet-test 1.0.2 499eefe7615aac5788fee3bb2bc2181fcfeb2ec2c9cea9daee22273f434a48fe
+splice-util-token-standard-wallet-test 1.0.2 64c3e13162682acaa8b01d5c612eaaf0b76e6af704796e467a58afd9869b9259
 splice-validator-lifecycle 0.1.0 cef96fac957362f1fc097120bd13686cac7f84fbc8053afa994a1f9214d9570c
 splice-validator-lifecycle 0.1.1 1ddf05c96002914593c929848b786f34c753fb0be07717d1786be177a564aada
 splice-validator-lifecycle 0.1.2 57e2f15f9755db1f00e51c52c319294264a21ad71c6bc1e7cd70db4b164c0aaa
@@ -96,7 +96,7 @@ splice-wallet 0.1.11 991842eee48ec3caa3a649e8f47e3544dd7b688ce4b363aa934a83db7da
 splice-wallet 0.1.12 b30bb727552cf6b624dbc9a5ff95f6c158e0a654e2e9c5c27bcfe3f5d0f9ada2
 splice-wallet 0.1.13 eb6e01efacc3397e23c6be8b9be7db4bf37672211974d69e24b48980e2f98b7e
 splice-wallet 0.1.14 690c1d47bac06db419db344d59a7a30c53fa3f5d961943fe1782cfc6c78794d8
-splice-wallet 0.1.15 d164bed10c3b9291dc64abed570103903510fb2b49d552340bb4c95b506bcb67
+splice-wallet 0.1.15 3bf81a1388dbcfa63d0e60dd4d6aa8e85d1df534b049247d78dd112ce7da9b63
 splice-wallet 0.1.2 c162e08a4ec0428bfa870b6d9040989e575c74199c3a80558c62e03196dd5146
 splice-wallet 0.1.3 2c35bb4f5084ea66db59717d21750bfd64c43147ef5fd5166615092d592a6917
 splice-wallet 0.1.4 141dad2d33b6410b8e1c35a0c4f8f76cb691e4d9a4410ce89f33f373855317e1
@@ -112,7 +112,7 @@ splice-wallet-payments 0.1.11 7266d861727757f3482857a77f25f4d647d8925b469e46938a
 splice-wallet-payments 0.1.12 88516902a9f045d3fd3835c8f5c8c6bfe4b44d83fae11369241f1883bb5b3ab4
 splice-wallet-payments 0.1.13 0b9250642d3864e6bbea553264dcac0d286104f24efad2fbaf4645520bcb4053
 splice-wallet-payments 0.1.14 45b29d6e05b5352c39edde850c66b4535c682b9991b06eec312176b1a48ecab5
-splice-wallet-payments 0.1.15 0b2eb2d075714ecbe8bf30fc8f6cd4d2bb5404a1fa61e840ff0a7b79e9356029
+splice-wallet-payments 0.1.15 910df7061818c41842fc61e77ddd350accf402acd32b3334e811fd9b4a23c470
 splice-wallet-payments 0.1.2 775f5eb9c0249509adda5eb3ea4ee31bb953601168c18880df6f2ff09ec4298a
 splice-wallet-payments 0.1.3 b953b3729c81a55e598a364be7d0c0574750df3de12a7a1b53a300f217cb5c5c
 splice-wallet-payments 0.1.4 12177f54873c1094ea169874ad0d7838383fd137f302d16356e93f28dfbc0fcc
@@ -121,15 +121,15 @@ 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.18 6feee76504d27b3a85ef3d507575218bd9a09844905eb0cfcbb4bd31162def7c
+splice-wallet-test 0.1.18 a81e1731fb392455328de1a283cbd5ea8329a7aadb9dd66465f2f0dcb05c2fca
 splitwell 0.1.0 075c76de553ab88383a7c69de134afa82aacfdf8ea8fcfe8852c4b199c3b2669
 splitwell 0.1.1 ccb1a0215053062202052e1a052f9214da3fdae5253a6d43e2e155ff4f57fe75
 splitwell 0.1.10 d42676a366f7ca7a2409974dd3054aa4d83ab29baa3b2086ad021407b0a1a295
 splitwell 0.1.11 03b487fa26a8ef67df0876fb337904624c3fac27f11b7ad2d131a4eab26ee1b4
 splitwell 0.1.12 cc047977ee8da70e858f203a14c3fd302c6aaed27be42383e61a026854d76112
 splitwell 0.1.13 c2cf7b5fb3c615cdd2c8e14af42f1ca5fe4df8647cb656c7d02a72420152c3dd
 splitwell 0.1.14 bf2ec3fec9bcb58ed5e2ff63072a1e4994d0415ea7a0275942be282906a42021
-splitwell 0.1.15 973f8a37fed116f26d9d3f2e92be4a9018d0882a3753194b7cd7f15cef24ac50
+splitwell 0.1.15 acee1828f38ea39fd59ee135c42a69a7196de971163ae1e4b023ca415a6a1155
 splitwell 0.1.2 778edd2c228c6b68198d4d033885b2d0dae7daaee55d7df3edd9dfdf1f10fbd0
 splitwell 0.1.3 7cde068cde689584f86a2499689d5cb165264d96496721e24ac6fb909f770a58
 splitwell 0.1.4 85557b86cd4f330f093915db1ea26eac5092de6b5ddae0690146f6059c89419b
@@ -138,4 +138,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.18 920ac467736768cfca04eea5a27e3191b9e392bd42a9ecfda75821fe4b066ae5
+splitwell-test 0.1.18 f89351b2fda5887994834a59a2e8448114ac3d3eef4247cd510c14080498a380

daml/dars/splice-amulet-0.1.15.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.16.dar

@@ -36,8 +36,8 @@ template Escrow
       controller p
       do LockedAmulet{lock,amulet=locked} <- fetchButArchiveLater (ForOwner with dso; owner = p) lockedAmulet -- archived as part of unlocking
          require "lock holder matches locked amulet " ([arbiter] == lock.holders)
-         result <- exercise lockedAmulet (LockedAmulet_Unlock transferContext.openMiningRound)
-         let cid = result.amuletSum.amulet
+         result <- exercise lockedAmulet LockedAmulet_UnlockV2
+         let cid = result.amuletCid
          let transfer = Transfer with
                sender = p
                provider = arbiter

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

@@ -16,9 +16,8 @@ import Splice.Fees
 import Splice.Expiry
 import Splice.Round
 import Splice.Types
-import Splice.RelRound
-import Splice.Schedule
 import Splice.Testing.Registries.AmuletRegistry.Parameters
+import Splice.Testing.Registries.AmuletRegistry (advanceToNextRoundChange)
 import Splice.Scripts.Util
 
 import DA.Foldable (forA_)
@@ -33,39 +32,14 @@ scaleAmuletConfig amuletPrice config = AmuletConfig with
   packageConfig = config.packageConfig
   transferPreapprovalFee = fmap (/ amuletPrice) config.transferPreapprovalFee
   featuredAppActivityMarkerAmount = fmap (/ amuletPrice) config.featuredAppActivityMarkerAmount
+  externalPartyConfigStateTickDuration = config.externalPartyConfigStateTickDuration
 
 test : Script ()
 test = script do
   DefaultAppWithUsers{..} <- setupDefaultAppWithUsers
-  advanceToNextRoundChange app -- advance time so we're out of the initial mining round
-  currentTime <- getTime
+  advanceToNextRoundChange app.dso -- advance time so we're out of the initial mining round
   let amuletPrice = 2.5
       config = scaleAmuletConfig amuletPrice defaultAmuletConfig
-      tickDuration = config.tickDuration
-
-      t00_00 = currentTime
-      t05_00 = addRelRoundN 2 currentTime tickDuration
-      t07_30 = addRelRoundN 3 currentTime tickDuration
-      t12_30 = addRelRoundN 5 currentTime tickDuration
-      t15_00 = addRelRoundN 6 currentTime tickDuration
-      t17_30 = addRelRoundN 7 currentTime tickDuration
-
-      issuingFor0 = days 0
-      issuingFor3 = issuingFor0 + tickDuration + tickDuration + tickDuration
-
-      amuletConfigUsd = defaultAmuletConfig
-      transferConfigUsd = amuletConfigUsd.transferConfig
-      issuanceConfig0 = getValueAsOf issuingFor0 amuletConfigUsd.issuanceCurve
-      issuanceConfig3 = getValueAsOf issuingFor3 amuletConfigUsd.issuanceCurve
-      openRound0 = OpenMiningRound with dso = app.dso; round = Round 0; amuletPrice; opensAt = t00_00; targetClosesAt = t05_00; issuingFor = issuingFor0; transferConfigUsd; issuanceConfig = issuanceConfig0; tickDuration
-      openRound3 = openRound0 with round = Round 3; opensAt = t07_30 ; targetClosesAt = t12_30; issuanceConfig = issuanceConfig3
-
-  -- Lock expires at T00:12:30
-  let lockExpiresAt12_30 = TimeLock with holders = [alice.primaryParty]; expiresAt = t12_30; optContext = None
-  -- Lock expires at T00:15:00
-  let lockExpiresAt15_00 = TimeLock with holders = [alice.primaryParty]; expiresAt = t15_00; optContext = None
-  -- Lock expires at T00:17:30
-  let lockExpiresAt17_30 = TimeLock with holders = [alice.primaryParty]; expiresAt = t17_30; optContext = None
 
   -- This amulet is estimated to expire at round 5.
   -- we exploit that there are exactly three open rounds active at any point in time.
@@ -75,60 +49,12 @@ test = script do
   let amountExpiresAtRound5 = ExpiringAmount with initialAmount = config.transferConfig.holdingFee.rate * 3.5; createdAt = Round 1; ratePerRound = config.transferConfig.holdingFee
   let bounded = amountExpiresAt amountExpiresAtRound5
   bounded === Singleton (Round 5)
-  let (Singleton r) = bounded
-  estimateOpenRoundCreatedAt config.tickDuration openRound3 (Singleton(addRelRound r (RelRound 2))) === Some (Singleton t15_00)
-
-  -- lock expires at T00:12:30 before amulet expires at T00:15:00
-  let lockExpireBeforeAmulet = doesLockExpireBeforeAmulet openRound3 lockExpiresAt12_30 amountExpiresAtRound5 config.tickDuration
-  assert lockExpireBeforeAmulet
-
-  -- lock expires at T00:15:00 while amulet expires at T00:15:00
-  let lockExpiresAsAmulet = doesLockExpireBeforeAmulet openRound3 lockExpiresAt15_00 amountExpiresAtRound5 config.tickDuration
-  assert $ not lockExpiresAsAmulet
-
-  -- lock expires at T00:17:30 after amulet expires at T00:15:00
-  let lockExpiresAfterAmulet = doesLockExpireBeforeAmulet openRound3 lockExpiresAt17_30 amountExpiresAtRound5 config.tickDuration
-  assert $ not lockExpiresAfterAmulet
-
-  let largeAmount = ExpiringAmount with initialAmount = 10000.0; createdAt = Round 1; ratePerRound = config.transferConfig.holdingFee
-  -- lock expires at T00:12:30 before amulet with large amount, which is regarded as never expires (EstimatedTime.AfterMaxTime)
-  let lockExpiresBeforeLargeAmulet = doesLockExpireBeforeAmulet openRound3 lockExpiresAt12_30 largeAmount config.tickDuration
-  assert lockExpiresBeforeLargeAmulet
-
-  pure ()
-
--- From #2336, This test case is to make sure we handle DA.Time overflow
--- in estimateOpenRoundCreatedAt when the amulet amount is too large
-testLargeAmuletExpiry : Script ()
-testLargeAmuletExpiry = script do
-  DefaultAppWithUsers{..} <- setupDefaultAppWithUsers
-  now <- getTime
-
-  let amuletPrice = 2.5
-      configUsd = defaultAmuletConfig
-      transferConfigAmulet = scaleFees (1.0 / amuletPrice) configUsd.transferConfig
-      e = ExpiringAmount with initialAmount = 10000.0; createdAt = Round 1; ratePerRound = transferConfigAmulet.holdingFee
-      Singleton r = amountExpiresAt e
-      expiringRound = Singleton $ addRelRound r (RelRound 2)
-      issuingFor = minutes 5
-      currentMiningRound = OpenMiningRound with
-        dso = app.dso
-        round = Round 1
-        amuletPrice = 1.0
-        opensAt = now
-        targetClosesAt = addRelTime now (minutes 5)
-        issuingFor
-        transferConfigUsd = configUsd.transferConfig
-        issuanceConfig = getValueAsOf issuingFor configUsd.issuanceCurve
-        tickDuration = configUsd.tickDuration
-
-  estimateOpenRoundCreatedAt configUsd.tickDuration currentMiningRound expiringRound === Some AfterMaxBound
   pure ()
 
 testExpireLockedAmulet : Script ()
 testExpireLockedAmulet = do
   DefaultAppWithUsers{..} <- setupDefaultAppWithUsers
-  advanceToNextRoundChange app -- advance time so we're out of the initial mining round
+  advanceToNextRoundChange app.dso -- advance time so we're out of the initial mining round
   passTime (minutes 10) -- pass enough time so that round 2 expires in 10 minutes
 
   -- Locking the amulet with with initialAmount 0.000005 and created at round 2 but with a