Skip to content

Commit 86dedb9

Browse files
cip-82: default optDevelopmentFundPercentage to 0.05 in AmuletRules_MiningRound_StartIssuing in case is None (this avoid a one week rolling out)
Signed-off-by: Jose Velasco <jose.velasco@intellecteu.com>
1 parent cfce301 commit 86dedb9

File tree

10 files changed

+20
-16
lines changed

10 files changed

+20
-16
lines changed

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/ConfigTransforms.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ object ConfigTransforms {
200200
updateAllAutomationConfigs(
201201
_.copy(rewardOperationRoundsCloseBufferDuration = NonNegativeFiniteDuration.ofMillis(100))
202202
),
203+
disableDevelopmentFund(),
203204
)
204205
}
205206

@@ -299,6 +300,9 @@ object ConfigTransforms {
299300
def disableZeroFees(): ConfigTransform =
300301
updateAllSvAppFoundDsoConfigs_(c => c.copy(zeroTransferFees = false))
301302

303+
def disableDevelopmentFund(): ConfigTransform =
304+
updateAllSvAppFoundDsoConfigs_(c => c.copy(developmentFundPercentage = Some(0.0)))
305+
302306
def updateAllValidatorAppConfigs(
303307
update: (String, ValidatorAppBackendConfig) => ValidatorAppBackendConfig
304308
): ConfigTransform =

daml/dars.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ splice-amulet 0.1.11 9824927cdb455f833867b74c01cffcd8cb8cc5edd4d2273cea1329b708e
55
splice-amulet 0.1.12 95a88ff9ffd509e097802ecf3bbd58c83a5dff408e439cca4e2105ebd2cd0760
66
splice-amulet 0.1.13 6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c
77
splice-amulet 0.1.14 3ca1343ab26b453d38c8adb70dca5f1ead8440c42b59b68f070786955cbf9ec1
8-
splice-amulet 0.1.15 2ddc31f55019af89d78fa91103ffb31bc10b5b12877f38d3edb60736d07ecd04
8+
splice-amulet 0.1.15 67fac2f853bce8dbf0b9817bb5ba7c59f10e8120b7c808696f7010e5f0c8a791
99
splice-amulet 0.1.2 1446ffdf23326cef2de97923df96618eb615792bea36cf1431f03639448f1645
1010
splice-amulet 0.1.3 0d89016d5a90eb8bced48bbac99e81c57781b3a36094b8d48b8e4389851e19af
1111
splice-amulet 0.1.4 a36ef8888fb44caae13d96341ce1fabd84fc9e2e7b209bbc3caabb48b6be1668
@@ -22,7 +22,7 @@ splice-amulet-name-service 0.1.12 557a74491324790b5cf5a379f2481ab1cd2c8b75530858
2222
splice-amulet-name-service 0.1.13 0e8c7e1cb828336bb4d537f6c4ecd94128b94733eb2ae1f55b5962757d357b4b
2323
splice-amulet-name-service 0.1.14 6cb1318176e758c256c2e385f87b86c5060e80fb68a72e8ceb08ac5f9045fff2
2424
splice-amulet-name-service 0.1.15 d4724b90dce9fb08badbb367962d237710b3a603e4f57806a1b0af308cc70fdb
25-
splice-amulet-name-service 0.1.16 0ae7ab05870ee248d29f8c65bc6b9a50b17612f7ef1e15496df93ed5ba8c5a80
25+
splice-amulet-name-service 0.1.16 53468a38bce11b51cd2ed10b9c09301c0b73570b50896d5649c4629de15815a3
2626
splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b92f066c865dbdeeabb
2727
splice-amulet-name-service 0.1.3 beb4b85f3f0cf36dfb93fc917d3ac218ee5d41b6e70604720cb228d85e168ee0
2828
splice-amulet-name-service 0.1.4 053c7f4c2a77312e7d465a4fa7dc8cb298754ad12c0c987a7c401bd724e65efc
@@ -31,8 +31,8 @@ splice-amulet-name-service 0.1.6 a208aab2c4a248ab2eff352bd382f8b3bbadc92464123db
3131
splice-amulet-name-service 0.1.7 ba7806d9b2d593eac74a050161c54ae1325d170bf175cb66a9c1e5e5ffb88c3d
3232
splice-amulet-name-service 0.1.8 efeb3f9b2b92e55fac4ec2d6164f95407a01477240c7465e576df4e310f54bd3
3333
splice-amulet-name-service 0.1.9 f1b5915ad45ded616f43f83c735b7ee158b5eb58abe758a721e50eee19b3e531
34-
splice-amulet-name-service-test 0.1.19 8d844bbfca3dec0e659a3a1ef9877e62b17340c6b75d75f9ab53528ecc625e44
35-
splice-amulet-test 0.1.18 d01f084b98a43820126fd24b4775c968f99c67b3d577ab943db1f898622931b5
34+
splice-amulet-name-service-test 0.1.19 6542e39b3393da6895548049bed03208db77b274140557c9d9d3be13c77ec885
35+
splice-amulet-test 0.1.18 a488e6bd06305296d918e1485abb8103e4984eacc09d0d5f558cac44e4f19e4f
3636
splice-api-featured-app-v1 1.0.0 7804375fe5e4c6d5afe067bd314c42fe0b7d005a1300019c73154dd939da4dda
3737
splice-api-token-allocation-instruction-v1 1.0.0 275064aacfe99cea72ee0c80563936129563776f67415ef9f13e4297eecbc520
3838
splice-api-token-allocation-request-v1 1.0.0 6fe848530b2404017c4a12874c956ad7d5c8a419ee9b040f96b5c13172d2e193
@@ -57,16 +57,16 @@ splice-dso-governance 0.1.18 136484875714fcf24c24858e1d573ac756524eeb607c26999fc
5757
splice-dso-governance 0.1.19 759d1cf002fc1225ac43a55d73f0058becce3e62cfb5485c197f2b69ed8d9d98
5858
splice-dso-governance 0.1.2 4206e127be8b111ac84bd7f98bd9dbf03ed489f1642b46ab31a46ee6d688e7e8
5959
splice-dso-governance 0.1.20 996a3b619d6b65ca7812881978c44c650cac119de78f5317d1f317658943001c
60-
splice-dso-governance 0.1.21 f3cd6e52e90952fad11b2b829307d1731937baf1e93978992d0a43038960fc1f
60+
splice-dso-governance 0.1.21 2d306cfe8cdb3daf2d21f84dfecc3e2f26a41504e58fe25cb7fe5cc65683d11f
6161
splice-dso-governance 0.1.3 b0ae3cc03e418790305a3c15f761fe495572de5827f8d322fb8b96996b783c13
6262
splice-dso-governance 0.1.4 dc24fd18b4d151cd1e0ff6bfb7438bafb2f50fe076d0f16f50565e60b153a0be
6363
splice-dso-governance 0.1.5 9e3ca1d22ad495dfabf3d61acae3dc1a7718f527f02092280b58cf69edfdc84c
6464
splice-dso-governance 0.1.6 4e7653cfbf7ca249de4507aca9cd3b91060e5489042a522c589d3c4199580cd8
6565
splice-dso-governance 0.1.7 d406eba1132d464605f4dae3edf8cf5ecbbb34bd8edef0e047e7e526d328718c
6666
splice-dso-governance 0.1.8 1790a114f83d5f290261fae1e7e46fba75a861a3dd603c6b4ef6b67b49053948
6767
splice-dso-governance 0.1.9 9ee83bfd872f91e659b8a8439c5b4eaf240bcf6f19698f884d7d7993ab48c401
68-
splice-dso-governance-test 0.1.25 7417f78304d202421bad040f400d8aa67e73336d77e2dd3270d98b4187d54a40
69-
splice-token-standard-test 1.0.9 dd87d77d97144417eac96c9e7a2259c5904f8c0c0ad47df1fb1fdb685d926255
68+
splice-dso-governance-test 0.1.25 a02cba80f1d2035184558614cc2030e7c714e6e549fbbb1e8180a5151ddc3913
69+
splice-token-standard-test 1.0.9 7010184aafc43bd9db506e02e660593d8bcdd48972b136684b70284f036363db
7070
splice-token-test-dummy-holding 0.0.1 1cd171c6c42ab46dc9cf12d80c6111369e00cea5cdf054924b4f26ce94b1ef5b
7171
splice-token-test-dummy-holding 0.0.2 4f40fb033ef3db89623642c1b494e846097fa32af138b3864a63aa15937a323d
7272
splice-token-test-trading-app 1.0.0 e5c9847d5a88d3b8d65436f01765fc5ba142cc58529692e2dacdd865d9939f71
@@ -80,9 +80,9 @@ splice-util-featured-app-proxies 1.0.0 48e0c4fe4ea05e3b740404ebe37004ddd741efbdc
8080
splice-util-featured-app-proxies 1.1.0 81dd5a9e5c02d0de03208522a895fb85eeb12fbea4aca7c4ad0ad106f3b0bfce
8181
splice-util-featured-app-proxies 1.2.0 653c48879064332d34af5008bdfd8e349493460e67e62b85e8e7e3392831c842
8282
splice-util-featured-app-proxies 1.2.1 06bab917848ef275317c2539b75c23b94e03ceb55b4a1346936f7832084cd7a6
83-
splice-util-featured-app-proxies-test 1.0.7 65357831d282f71fb531193777f5da0b4c44d4fe0c54a3f2e741b04764129352
83+
splice-util-featured-app-proxies-test 1.0.7 f78f117532321b952ac8b6dc4a9c83659369d537be52d3f9a6950a87f12d8f43
8484
splice-util-token-standard-wallet 1.0.0 1da198cb7968fa478cfa12aba9fdf128a63a8af6ab284ea6be238cf92a3733ac
85-
splice-util-token-standard-wallet-test 1.0.2 a4a173b17f91a07769309f27dcf6c713e3627e2d9181fcaea9e813b168af58ba
85+
splice-util-token-standard-wallet-test 1.0.2 b2d3452df2c64bda9ff0ecf11fa07ed61344415328ed08cb807938295232b134
8686
splice-validator-lifecycle 0.1.0 cef96fac957362f1fc097120bd13686cac7f84fbc8053afa994a1f9214d9570c
8787
splice-validator-lifecycle 0.1.1 1ddf05c96002914593c929848b786f34c753fb0be07717d1786be177a564aada
8888
splice-validator-lifecycle 0.1.2 57e2f15f9755db1f00e51c52c319294264a21ad71c6bc1e7cd70db4b164c0aaa
@@ -98,7 +98,7 @@ splice-wallet 0.1.11 991842eee48ec3caa3a649e8f47e3544dd7b688ce4b363aa934a83db7da
9898
splice-wallet 0.1.12 b30bb727552cf6b624dbc9a5ff95f6c158e0a654e2e9c5c27bcfe3f5d0f9ada2
9999
splice-wallet 0.1.13 eb6e01efacc3397e23c6be8b9be7db4bf37672211974d69e24b48980e2f98b7e
100100
splice-wallet 0.1.14 690c1d47bac06db419db344d59a7a30c53fa3f5d961943fe1782cfc6c78794d8
101-
splice-wallet 0.1.15 dbe329e62607aa9a1f25d1faad7b75f6782ae177271d61499a3c55144ffbbcd8
101+
splice-wallet 0.1.15 fd57252dda29e3ce90028114c91b521cb661df5a9d6e87c41a9e91518215fa5b
102102
splice-wallet 0.1.2 c162e08a4ec0428bfa870b6d9040989e575c74199c3a80558c62e03196dd5146
103103
splice-wallet 0.1.3 2c35bb4f5084ea66db59717d21750bfd64c43147ef5fd5166615092d592a6917
104104
splice-wallet 0.1.4 141dad2d33b6410b8e1c35a0c4f8f76cb691e4d9a4410ce89f33f373855317e1
@@ -114,7 +114,7 @@ splice-wallet-payments 0.1.11 7266d861727757f3482857a77f25f4d647d8925b469e46938a
114114
splice-wallet-payments 0.1.12 88516902a9f045d3fd3835c8f5c8c6bfe4b44d83fae11369241f1883bb5b3ab4
115115
splice-wallet-payments 0.1.13 0b9250642d3864e6bbea553264dcac0d286104f24efad2fbaf4645520bcb4053
116116
splice-wallet-payments 0.1.14 45b29d6e05b5352c39edde850c66b4535c682b9991b06eec312176b1a48ecab5
117-
splice-wallet-payments 0.1.15 23620494e5861a9cb2ed77966ba452255256d9306d96f14146f95295c80f5f8e
117+
splice-wallet-payments 0.1.15 f80fae7a9de9431854372a66c3ca78675f77b2f54ede65abdc1b1abdec707d21
118118
splice-wallet-payments 0.1.2 775f5eb9c0249509adda5eb3ea4ee31bb953601168c18880df6f2ff09ec4298a
119119
splice-wallet-payments 0.1.3 b953b3729c81a55e598a364be7d0c0574750df3de12a7a1b53a300f217cb5c5c
120120
splice-wallet-payments 0.1.4 12177f54873c1094ea169874ad0d7838383fd137f302d16356e93f28dfbc0fcc
@@ -123,15 +123,15 @@ splice-wallet-payments 0.1.6 6124379528eeb6fa17ecdab15577c29abb33d0c0d34dc5f2680
123123
splice-wallet-payments 0.1.7 4e3e0d9cdadf80f4bf8f3cd3660d5287c084c9a29f23c901aabce597d72fd467
124124
splice-wallet-payments 0.1.8 e48ea337ee3335c8bb3206a2501ce947ac1a7bdb1825cee8f28bad64f5a7bc4b
125125
splice-wallet-payments 0.1.9 7f4e081ad96f2ccded0c053b0cf5ddddae1139dfc3bb89cefcf77ea70f2cecb7
126-
splice-wallet-test 0.1.18 4545a5fd96bf70b52aa5d898bbba993b2bd4dbfa98a086c27cadb38c541a9253
126+
splice-wallet-test 0.1.18 f658717551440b5c05502aee61b834020c4490aef2e4edce118c45313d386f21
127127
splitwell 0.1.0 075c76de553ab88383a7c69de134afa82aacfdf8ea8fcfe8852c4b199c3b2669
128128
splitwell 0.1.1 ccb1a0215053062202052e1a052f9214da3fdae5253a6d43e2e155ff4f57fe75
129129
splitwell 0.1.10 d42676a366f7ca7a2409974dd3054aa4d83ab29baa3b2086ad021407b0a1a295
130130
splitwell 0.1.11 03b487fa26a8ef67df0876fb337904624c3fac27f11b7ad2d131a4eab26ee1b4
131131
splitwell 0.1.12 cc047977ee8da70e858f203a14c3fd302c6aaed27be42383e61a026854d76112
132132
splitwell 0.1.13 c2cf7b5fb3c615cdd2c8e14af42f1ca5fe4df8647cb656c7d02a72420152c3dd
133133
splitwell 0.1.14 bf2ec3fec9bcb58ed5e2ff63072a1e4994d0415ea7a0275942be282906a42021
134-
splitwell 0.1.15 114dab13425c8dfa7dde597759c05f32d81583b2fe3f88c46e041a78d2fc38e7
134+
splitwell 0.1.15 2f3d8a50f57e66af450c36556a09d04c1d9117b699720118b7bd302556805499
135135
splitwell 0.1.2 778edd2c228c6b68198d4d033885b2d0dae7daaee55d7df3edd9dfdf1f10fbd0
136136
splitwell 0.1.3 7cde068cde689584f86a2499689d5cb165264d96496721e24ac6fb909f770a58
137137
splitwell 0.1.4 85557b86cd4f330f093915db1ea26eac5092de6b5ddae0690146f6059c89419b
@@ -140,4 +140,4 @@ splitwell 0.1.6 872da0dd7986fd768930f85d6a7310a94a0ef924e7fbb7bb7a4e149f2b5feb74
140140
splitwell 0.1.7 841d1c9c86b5c8f3a39059459ecd8febedf7703e18f117300bb0ebf4423db096
141141
splitwell 0.1.8 63b8153a08ceb4bf40d807acc5712372c3eac548c266be4d5e92470b4f655515
142142
splitwell 0.1.9 b6267905698d2798b9ef171e27d49fb88e052ec0ec0e0675a3a1b275c7d037d4
143-
splitwell-test 0.1.18 b7d8c934a90473b1ff805d35e5f2f985733ecd72c9b1980abfcf32d99c8fece4
143+
splitwell-test 0.1.18 022ee9f4acf3c29af6abcc21ec8d5e3acac2dadfec123adfc97932b1f13348a6

daml/dars/splice-amulet-0.1.15.dar

14 Bytes
Binary file not shown.
24 Bytes
Binary file not shown.
8 Bytes
Binary file not shown.

daml/dars/splice-wallet-0.1.15.dar

31 Bytes
Binary file not shown.
6 Bytes
Binary file not shown.

daml/dars/splitwell-0.1.15.dar

20 Bytes
Binary file not shown.

daml/splice-amulet/daml/Splice/Issuance.daml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ computeIssuingRoundParameters tickDuration amuletPrice config summary =
102102
issuancePerValidatorFaucetCoupon = validatorFaucetIssuance.issuancePerCoupon
103103
optAmuletsToIssueToDevelopmentFund = Some amuletsToIssueToDevelopmentFund
104104
where
105-
developmentFundPercentage = fromOptional 0.0 config.optDevelopmentFundPercentage
105+
developmentFundPercentage = fromOptional 0.05 config.optDevelopmentFundPercentage
106106

107107
amuletsToIssueToSvs =
108108
adjustedAmuletsToIssueInRound

token-standard/splice-token-standard-test/daml/Splice/Testing/Registries/AmuletRegistry/Parameters.daml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ issuanceConfig_10plus = IssuanceConfig with
133133
featuredAppRewardCap = 100.0
134134
unfeaturedAppRewardCap = 0.6
135135
optValidatorFaucetCap = None -- We use the default of 2.85 USD introduced in the upgrade for CIP-3
136-
optDevelopmentFundPercentage = None
136+
optDevelopmentFundPercentage = Some 0.0
137137

138138

139139
defaultIssuanceCurve : Schedule RelTime IssuanceConfig

0 commit comments

Comments
 (0)