Skip to content

Commit f19898b

Browse files
committed
Support transfers with 24h validity period
[ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
1 parent 2896359 commit f19898b

File tree

50 files changed

+818
-553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+818
-553
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,10 @@ class AppUpgradeIntegrationTest
256256
DarResources.wallet.bootstrap.metadata.version.toString(),
257257
DarResources.walletPayments.bootstrap.metadata.version.toString(),
258258
),
259-
java.util.Optional.empty(),
260-
java.util.Optional.empty(),
261-
java.util.Optional.empty(),
259+
amuletConfig.transferPreapprovalFee,
260+
amuletConfig.featuredAppActivityMarkerAmount,
261+
amuletConfig.optDevelopmentFundManager,
262+
amuletConfig.externalPartyConfigStateTickDuration,
262263
)
263264
val upgradeAction = new ARC_AmuletRules(
264265
new CRARC_SetConfig(

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
229229
),
230230
amuletConfig.transferPreapprovalFee,
231231
amuletConfig.featuredAppActivityMarkerAmount,
232-
java.util.Optional.empty(),
232+
amuletConfig.optDevelopmentFundManager,
233+
amuletConfig.externalPartyConfigStateTickDuration,
233234
)
234235

235236
val upgradeAction = new ARC_AmuletRules(
@@ -368,7 +369,8 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
368369
amuletConfig.packageConfig,
369370
amuletConfig.transferPreapprovalFee,
370371
amuletConfig.featuredAppActivityMarkerAmount,
371-
java.util.Optional.empty(),
372+
amuletConfig.optDevelopmentFundManager,
373+
amuletConfig.externalPartyConfigStateTickDuration,
372374
)
373375

374376
val upgradeAction = new ARC_AmuletRules(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ class SvReconcileSynchronizerConfigIntegrationTest extends SvIntegrationTestBase
141141
amuletConfig.packageConfig,
142142
amuletConfig.transferPreapprovalFee,
143143
amuletConfig.featuredAppActivityMarkerAmount,
144-
java.util.Optional.empty(),
144+
amuletConfig.optDevelopmentFundManager,
145+
amuletConfig.externalPartyConfigStateTickDuration,
145146
)
146147

147148
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,8 @@ class SvStateManagementIntegrationTest extends SvIntegrationTestBase with Trigge
487487
initialConfig.packageConfig,
488488
initialConfig.transferPreapprovalFee,
489489
initialConfig.featuredAppActivityMarkerAmount,
490-
java.util.Optional.empty(),
490+
initialConfig.optDevelopmentFundManager,
491+
initialConfig.externalPartyConfigStateTickDuration,
491492
)
492493

493494
val (_, voteRequestCid) = actAndCheck(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ trait AmuletConfigUtil extends TestCommon {
6262
existingAmuletConfig.transferPreapprovalFee,
6363
existingAmuletConfig.featuredAppActivityMarkerAmount,
6464
existingAmuletConfig.optDevelopmentFundManager,
65+
existingAmuletConfig.externalPartyConfigStateTickDuration,
6566
)
6667
}
6768

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,8 @@ object SpliceUtil {
379379
initialPackageConfig,
380380
transferPreapprovalFee.map(_.bigDecimal).toJava,
381381
featuredAppActivityMarkerAmount.map(_.bigDecimal).toJava,
382-
Optional.empty(),
382+
Optional.empty(), // optDevelopmentFundmanager
383+
Optional.empty(), // externalPartyConfigStateTickDuration
383384
)
384385

385386
def defaultAnsConfig(

apps/common/src/test/scala/org/lfdecentralizedtrust/splice/store/StoreTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ abstract class StoreTest extends AsyncWordSpec with BaseTest {
158158
dsoParty.toProtoPrimitive,
159159
schedule(initialTickDuration),
160160
false,
161+
java.util.Optional.empty(), // contractStateSchemaVersion
161162
)
162163
contract(
163164
identifier = templateId,

apps/scan/src/test/scala/org/lfdecentralizedtrust/splice/scan/admin/api/client/BftScanConnectionTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ class BftScanConnectionTest
104104
synchronizerId,
105105
),
106106
false,
107+
java.util.Optional.empty(),
107108
),
108109
ByteString.EMPTY,
109110
Instant.EPOCH,

daml/dars.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ splice-amulet 0.1.12 95a88ff9ffd509e097802ecf3bbd58c83a5dff408e439cca4e2105ebd2c
66
splice-amulet 0.1.13 6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c
77
splice-amulet 0.1.14 3ca1343ab26b453d38c8adb70dca5f1ead8440c42b59b68f070786955cbf9ec1
88
splice-amulet 0.1.15 67fac2f853bce8dbf0b9817bb5ba7c59f10e8120b7c808696f7010e5f0c8a791
9-
splice-amulet 0.1.16 2e91a702709b7732622ecab5e93639c7e6d1de1170e00e711ba0588b21db84c5
9+
splice-amulet 0.1.16 5bd794149ea0c9515f3f31ab639074d45ba72c33f07d71d23b403e6a683e18f4
1010
splice-amulet 0.1.2 1446ffdf23326cef2de97923df96618eb615792bea36cf1431f03639448f1645
1111
splice-amulet 0.1.3 0d89016d5a90eb8bced48bbac99e81c57781b3a36094b8d48b8e4389851e19af
1212
splice-amulet 0.1.4 a36ef8888fb44caae13d96341ce1fabd84fc9e2e7b209bbc3caabb48b6be1668
@@ -24,7 +24,7 @@ splice-amulet-name-service 0.1.13 0e8c7e1cb828336bb4d537f6c4ecd94128b94733eb2ae1
2424
splice-amulet-name-service 0.1.14 6cb1318176e758c256c2e385f87b86c5060e80fb68a72e8ceb08ac5f9045fff2
2525
splice-amulet-name-service 0.1.15 d4724b90dce9fb08badbb367962d237710b3a603e4f57806a1b0af308cc70fdb
2626
splice-amulet-name-service 0.1.16 53468a38bce11b51cd2ed10b9c09301c0b73570b50896d5649c4629de15815a3
27-
splice-amulet-name-service 0.1.17 7f52d2767c3be8b9df96582fa5dfd8a357699c255d46b9dffd96830c76843d84
27+
splice-amulet-name-service 0.1.17 4bcc4f4700217dcf82b588706fc6eb399b4d79127fff4e66dccb2cc32fe6f957
2828
splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b92f066c865dbdeeabb
2929
splice-amulet-name-service 0.1.3 beb4b85f3f0cf36dfb93fc917d3ac218ee5d41b6e70604720cb228d85e168ee0
3030
splice-amulet-name-service 0.1.4 053c7f4c2a77312e7d465a4fa7dc8cb298754ad12c0c987a7c401bd724e65efc
@@ -33,8 +33,8 @@ splice-amulet-name-service 0.1.6 a208aab2c4a248ab2eff352bd382f8b3bbadc92464123db
3333
splice-amulet-name-service 0.1.7 ba7806d9b2d593eac74a050161c54ae1325d170bf175cb66a9c1e5e5ffb88c3d
3434
splice-amulet-name-service 0.1.8 efeb3f9b2b92e55fac4ec2d6164f95407a01477240c7465e576df4e310f54bd3
3535
splice-amulet-name-service 0.1.9 f1b5915ad45ded616f43f83c735b7ee158b5eb58abe758a721e50eee19b3e531
36-
splice-amulet-name-service-test 0.1.20 6eef1b7632b383a6c9810bb0cd78a0bc491021989d25f813ec5579d8cae0706d
37-
splice-amulet-test 0.1.19 1c64fdca4f39737f835329af4f3b74bbf243322170b6753f654b61c6b1447369
36+
splice-amulet-name-service-test 0.1.20 1c7a4e934ac674279eda6f7e3b81afb645ad541a854625e6e6746c8a5cdb920b
37+
splice-amulet-test 0.1.19 12119d7436b7541b9c6cc723041950a35963494a97e0dcff6abecafc21f932e4
3838
splice-api-featured-app-v1 1.0.0 7804375fe5e4c6d5afe067bd314c42fe0b7d005a1300019c73154dd939da4dda
3939
splice-api-token-allocation-instruction-v1 1.0.0 275064aacfe99cea72ee0c80563936129563776f67415ef9f13e4297eecbc520
4040
splice-api-token-allocation-request-v1 1.0.0 6fe848530b2404017c4a12874c956ad7d5c8a419ee9b040f96b5c13172d2e193
@@ -60,16 +60,16 @@ splice-dso-governance 0.1.19 759d1cf002fc1225ac43a55d73f0058becce3e62cfb5485c197
6060
splice-dso-governance 0.1.2 4206e127be8b111ac84bd7f98bd9dbf03ed489f1642b46ab31a46ee6d688e7e8
6161
splice-dso-governance 0.1.20 996a3b619d6b65ca7812881978c44c650cac119de78f5317d1f317658943001c
6262
splice-dso-governance 0.1.21 2d306cfe8cdb3daf2d21f84dfecc3e2f26a41504e58fe25cb7fe5cc65683d11f
63-
splice-dso-governance 0.1.22 180ec0980e3498d6297cf40028584b7a807f9a0dcb05f44f5c5d9fd62744a053
63+
splice-dso-governance 0.1.22 487c0c58c88891ab7ff66ace47f3de863d9ee694c214afe6bd1ed699d955e536
6464
splice-dso-governance 0.1.3 b0ae3cc03e418790305a3c15f761fe495572de5827f8d322fb8b96996b783c13
6565
splice-dso-governance 0.1.4 dc24fd18b4d151cd1e0ff6bfb7438bafb2f50fe076d0f16f50565e60b153a0be
6666
splice-dso-governance 0.1.5 9e3ca1d22ad495dfabf3d61acae3dc1a7718f527f02092280b58cf69edfdc84c
6767
splice-dso-governance 0.1.6 4e7653cfbf7ca249de4507aca9cd3b91060e5489042a522c589d3c4199580cd8
6868
splice-dso-governance 0.1.7 d406eba1132d464605f4dae3edf8cf5ecbbb34bd8edef0e047e7e526d328718c
6969
splice-dso-governance 0.1.8 1790a114f83d5f290261fae1e7e46fba75a861a3dd603c6b4ef6b67b49053948
7070
splice-dso-governance 0.1.9 9ee83bfd872f91e659b8a8439c5b4eaf240bcf6f19698f884d7d7993ab48c401
71-
splice-dso-governance-test 0.1.26 cff06b6cd81ec8134a44eee577c1f5934bd279528b51811194a92b918347ff7f
72-
splice-token-standard-test 1.0.10 02825979e9e77085a44f4c0fa6535608c5f2249d1ece294b0e27aa1195b99741
71+
splice-dso-governance-test 0.1.26 239261c0095a10162c7897ccfaf8cf6305bc4e0d4d2ec3d6e4b7abd0e5cec1ca
72+
splice-token-standard-test 1.0.10 30cae5b78b7aacd8763cf5318e46a03068ee6b85e5d9cf9a4ebdc5bedb09c433
7373
splice-token-test-dummy-holding 0.0.1 1cd171c6c42ab46dc9cf12d80c6111369e00cea5cdf054924b4f26ce94b1ef5b
7474
splice-token-test-dummy-holding 0.0.2 4f40fb033ef3db89623642c1b494e846097fa32af138b3864a63aa15937a323d
7575
splice-token-test-trading-app 1.0.0 e5c9847d5a88d3b8d65436f01765fc5ba142cc58529692e2dacdd865d9939f71
@@ -83,9 +83,9 @@ splice-util-featured-app-proxies 1.0.0 48e0c4fe4ea05e3b740404ebe37004ddd741efbdc
8383
splice-util-featured-app-proxies 1.1.0 81dd5a9e5c02d0de03208522a895fb85eeb12fbea4aca7c4ad0ad106f3b0bfce
8484
splice-util-featured-app-proxies 1.2.0 653c48879064332d34af5008bdfd8e349493460e67e62b85e8e7e3392831c842
8585
splice-util-featured-app-proxies 1.2.1 06bab917848ef275317c2539b75c23b94e03ceb55b4a1346936f7832084cd7a6
86-
splice-util-featured-app-proxies-test 1.0.8 093646f34eb9c82cddb3ec05f86928574ad5ceb24a2706ec4ccb6bd686d99b81
86+
splice-util-featured-app-proxies-test 1.0.8 a1185b1463656d12432d1226c8019a1d99e4cd38f2641e2bcc5cc77f2c00e231
8787
splice-util-token-standard-wallet 1.0.0 1da198cb7968fa478cfa12aba9fdf128a63a8af6ab284ea6be238cf92a3733ac
88-
splice-util-token-standard-wallet-test 1.0.3 eb60a40f9b3e3124566b97c060cdbc5c1ce1215846c9f1a0a07067d506a0977a
88+
splice-util-token-standard-wallet-test 1.0.3 a8c183a7d7da061b3e5ca98e5669137acd78dca5ca1da07899c3ba0f22182de6
8989
splice-validator-lifecycle 0.1.0 cef96fac957362f1fc097120bd13686cac7f84fbc8053afa994a1f9214d9570c
9090
splice-validator-lifecycle 0.1.1 1ddf05c96002914593c929848b786f34c753fb0be07717d1786be177a564aada
9191
splice-validator-lifecycle 0.1.2 57e2f15f9755db1f00e51c52c319294264a21ad71c6bc1e7cd70db4b164c0aaa
@@ -102,7 +102,7 @@ splice-wallet 0.1.12 b30bb727552cf6b624dbc9a5ff95f6c158e0a654e2e9c5c27bcfe3f5d0f
102102
splice-wallet 0.1.13 eb6e01efacc3397e23c6be8b9be7db4bf37672211974d69e24b48980e2f98b7e
103103
splice-wallet 0.1.14 690c1d47bac06db419db344d59a7a30c53fa3f5d961943fe1782cfc6c78794d8
104104
splice-wallet 0.1.15 fd57252dda29e3ce90028114c91b521cb661df5a9d6e87c41a9e91518215fa5b
105-
splice-wallet 0.1.16 a940e07b593b6d6ca8ec4f0f4f1b7483e371265d53362f5e9af054b2a5c50fc3
105+
splice-wallet 0.1.16 e9dd49a124bd1c4aafad273860307f810c574b103876dc475f8f71654a165363
106106
splice-wallet 0.1.2 c162e08a4ec0428bfa870b6d9040989e575c74199c3a80558c62e03196dd5146
107107
splice-wallet 0.1.3 2c35bb4f5084ea66db59717d21750bfd64c43147ef5fd5166615092d592a6917
108108
splice-wallet 0.1.4 141dad2d33b6410b8e1c35a0c4f8f76cb691e4d9a4410ce89f33f373855317e1
@@ -119,7 +119,7 @@ splice-wallet-payments 0.1.12 88516902a9f045d3fd3835c8f5c8c6bfe4b44d83fae1136924
119119
splice-wallet-payments 0.1.13 0b9250642d3864e6bbea553264dcac0d286104f24efad2fbaf4645520bcb4053
120120
splice-wallet-payments 0.1.14 45b29d6e05b5352c39edde850c66b4535c682b9991b06eec312176b1a48ecab5
121121
splice-wallet-payments 0.1.15 f80fae7a9de9431854372a66c3ca78675f77b2f54ede65abdc1b1abdec707d21
122-
splice-wallet-payments 0.1.16 11ca4e7f82adca52a5baba4c4740626e9b5d7d91f6d770a44436e563814a350b
122+
splice-wallet-payments 0.1.16 a78e0843d6a3c0413843706e75c0a68448f51e30355e5ef9b79e1e9450a90a26
123123
splice-wallet-payments 0.1.2 775f5eb9c0249509adda5eb3ea4ee31bb953601168c18880df6f2ff09ec4298a
124124
splice-wallet-payments 0.1.3 b953b3729c81a55e598a364be7d0c0574750df3de12a7a1b53a300f217cb5c5c
125125
splice-wallet-payments 0.1.4 12177f54873c1094ea169874ad0d7838383fd137f302d16356e93f28dfbc0fcc
@@ -128,7 +128,7 @@ splice-wallet-payments 0.1.6 6124379528eeb6fa17ecdab15577c29abb33d0c0d34dc5f2680
128128
splice-wallet-payments 0.1.7 4e3e0d9cdadf80f4bf8f3cd3660d5287c084c9a29f23c901aabce597d72fd467
129129
splice-wallet-payments 0.1.8 e48ea337ee3335c8bb3206a2501ce947ac1a7bdb1825cee8f28bad64f5a7bc4b
130130
splice-wallet-payments 0.1.9 7f4e081ad96f2ccded0c053b0cf5ddddae1139dfc3bb89cefcf77ea70f2cecb7
131-
splice-wallet-test 0.1.19 386f89f31515ae35866d12bc57dc7f6268165915dc3ade96dfa81676a9662fa8
131+
splice-wallet-test 0.1.19 59bbe80f67abeb2dcd1e4de3bc9ea63600aece222c4e19ed62ba9d2ab22e6aa0
132132
splitwell 0.1.0 075c76de553ab88383a7c69de134afa82aacfdf8ea8fcfe8852c4b199c3b2669
133133
splitwell 0.1.1 ccb1a0215053062202052e1a052f9214da3fdae5253a6d43e2e155ff4f57fe75
134134
splitwell 0.1.10 d42676a366f7ca7a2409974dd3054aa4d83ab29baa3b2086ad021407b0a1a295
@@ -137,7 +137,7 @@ splitwell 0.1.12 cc047977ee8da70e858f203a14c3fd302c6aaed27be42383e61a026854d7611
137137
splitwell 0.1.13 c2cf7b5fb3c615cdd2c8e14af42f1ca5fe4df8647cb656c7d02a72420152c3dd
138138
splitwell 0.1.14 bf2ec3fec9bcb58ed5e2ff63072a1e4994d0415ea7a0275942be282906a42021
139139
splitwell 0.1.15 2f3d8a50f57e66af450c36556a09d04c1d9117b699720118b7bd302556805499
140-
splitwell 0.1.16 27652a3a292d7bcbe7e4c795ee10748f0519d9d433c075b426c91df90f275b85
140+
splitwell 0.1.16 5248b19a6c66df3bac8397b04d4fa46ca66161b8768d6278aaab0227cd5003d8
141141
splitwell 0.1.2 778edd2c228c6b68198d4d033885b2d0dae7daaee55d7df3edd9dfdf1f10fbd0
142142
splitwell 0.1.3 7cde068cde689584f86a2499689d5cb165264d96496721e24ac6fb909f770a58
143143
splitwell 0.1.4 85557b86cd4f330f093915db1ea26eac5092de6b5ddae0690146f6059c89419b
@@ -146,4 +146,4 @@ splitwell 0.1.6 872da0dd7986fd768930f85d6a7310a94a0ef924e7fbb7bb7a4e149f2b5feb74
146146
splitwell 0.1.7 841d1c9c86b5c8f3a39059459ecd8febedf7703e18f117300bb0ebf4423db096
147147
splitwell 0.1.8 63b8153a08ceb4bf40d807acc5712372c3eac548c266be4d5e92470b4f655515
148148
splitwell 0.1.9 b6267905698d2798b9ef171e27d49fb88e052ec0ec0e0675a3a1b275c7d037d4
149-
splitwell-test 0.1.19 37cafd5988552e48ae5dfd17e2a192eb8d165ae4dcaf1ddb0589c9ac49090aed
149+
splitwell-test 0.1.19 27182748cd756819acd184f2295a29b3ec47057e8e8d959cb6390c200b942ba4

daml/dars/splice-amulet-0.1.16.dar

56.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)