Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ object ConfigTransforms {
updateAllAutomationConfigs(
_.copy(rewardOperationRoundsCloseBufferDuration = NonNegativeFiniteDuration.ofMillis(100))
),
disableDevelopmentFund(),
)
}

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

def disableDevelopmentFund(): ConfigTransform =
updateAllSvAppFoundDsoConfigs_(c => c.copy(developmentFundPercentage = Some(0.0)))

def updateAllValidatorAppConfigs(
update: (String, ValidatorAppBackendConfig) => ValidatorAppBackendConfig
): ConfigTransform =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,18 @@ trait PackageVersionSupport extends NamedLogging {
)
}

def supportDevelopmentFund(parties: Seq[PartyId], now: CantonTimestamp)(implicit
tc: TraceContext
): Future[FeatureSupport] = {
isDarSupported(
parties,
PackageIdResolver.Package.SpliceDsoGovernance,
now,
DarResources.dsoGovernance,
DarResources.dsoGovernance_0_1_21,
)
}

private def isDarSupported(
parties: Seq[PartyId],
packageId: PackageIdResolver.Package,
Expand Down
19 changes: 12 additions & 7 deletions apps/sv/frontend/src/utils/buildAmuletRulesConfigFromChanges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ export function buildAmuletRulesConfigFromChanges(
const futureValues: Tuple2<RelTime, IssuanceConfig>[] = [];
for (let i = 0; i < futureValuesCount; i++) {
const time = { microseconds: getValue(`issuanceCurveFutureValues${i}`) };
const futureOptDevelopmentFundPercentage = getValue(
`issuanceCurveFutureValues${i}OptDevelopmentFundPercentage`
);
const config: IssuanceConfig = {
amuletToIssuePerYear: getValue(`issuanceCurveFutureValues${i}AmuletToIssuePerYear`),
validatorRewardPercentage: getValue(`issuanceCurveFutureValues${i}ValidatorRewardPercentage`),
Expand All @@ -70,19 +73,22 @@ export function buildAmuletRulesConfigFromChanges(
featuredAppRewardCap: getValue(`issuanceCurveFutureValues${i}FeaturedAppRewardCap`),
unfeaturedAppRewardCap: getValue(`issuanceCurveFutureValues${i}UnfeaturedAppRewardCap`),
optValidatorFaucetCap: getValue(`issuanceCurveFutureValues${i}OptValidatorFaucetCap`),
optDevelopmentFundPercentage: getValue(
`issuanceCurveFutureValues${i}OptDevelopmentFundPercentage`
),
optDevelopmentFundPercentage:
futureOptDevelopmentFundPercentage === '' ? null : futureOptDevelopmentFundPercentage,
};
futureValues.push({ _1: time, _2: config });
}

const transferPreapprovalFee = getValue('transferPreapprovalFee');
const optDevelopmentFundManager = getValue('optDevelopmentFundManager');
const initialOptDevelopmentFundPercentage = getValue(
'issuanceCurveInitialValueOptDevelopmentFundPercentage'
);
const amuletConfig: AmuletConfig<'USD'> = {
tickDuration: { microseconds: getValue('tickDuration') },
transferPreapprovalFee: transferPreapprovalFee === '' ? null : transferPreapprovalFee,
featuredAppActivityMarkerAmount: getValue('featuredAppActivityMarkerAmount'),
optDevelopmentFundManager: getValue('optDevelopmentFundManager'),
optDevelopmentFundManager: optDevelopmentFundManager === '' ? null : optDevelopmentFundManager,

transferConfig: {
createFee: { fee: getValue('transferConfigCreateFee') },
Expand All @@ -107,9 +113,8 @@ export function buildAmuletRulesConfigFromChanges(
featuredAppRewardCap: getValue('issuanceCurveInitialValueFeaturedAppRewardCap'),
unfeaturedAppRewardCap: getValue('issuanceCurveInitialValueUnfeaturedAppRewardCap'),
optValidatorFaucetCap: getValue('issuanceCurveInitialValueOptValidatorFaucetCap'),
optDevelopmentFundPercentage: getValue(
'issuanceCurveInitialValueOptDevelopmentFundPercentage'
),
optDevelopmentFundPercentage:
initialOptDevelopmentFundPercentage === '' ? null : initialOptDevelopmentFundPercentage,
},
futureValues: futureValues,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -671,23 +671,28 @@ class SV1Initializer(
show"This should never happen.\nAmuletRules: $amuletRules"
)
case None =>
val amuletConfig = defaultAmuletConfig(
sv1Config.initialTickDuration,
sv1Config.initialMaxNumInputs,
synchronizerId,
sv1Config.initialSynchronizerFeesConfig.extraTrafficPrice.value,
sv1Config.initialSynchronizerFeesConfig.minTopupAmount.value,
sv1Config.initialSynchronizerFeesConfig.baseRateBurstAmount.value,
sv1Config.initialSynchronizerFeesConfig.baseRateBurstWindow,
sv1Config.initialSynchronizerFeesConfig.readVsWriteScalingFactor.value,
sv1Config.initialPackageConfig.toPackageConfig,
sv1Config.initialHoldingFee,
sv1Config.zeroTransferFees,
sv1Config.initialTransferPreapprovalFee,
sv1Config.initialFeaturedAppActivityMarkerAmount,
developmentFundPercentage = sv1Config.developmentFundPercentage,
)
for {
developmentFund <- packageVersionSupport.supportDevelopmentFund(
Seq(svParty),
clock.now,
)
amuletConfig = defaultAmuletConfig(
sv1Config.initialTickDuration,
sv1Config.initialMaxNumInputs,
synchronizerId,
sv1Config.initialSynchronizerFeesConfig.extraTrafficPrice.value,
sv1Config.initialSynchronizerFeesConfig.minTopupAmount.value,
sv1Config.initialSynchronizerFeesConfig.baseRateBurstAmount.value,
sv1Config.initialSynchronizerFeesConfig.baseRateBurstWindow,
sv1Config.initialSynchronizerFeesConfig.readVsWriteScalingFactor.value,
sv1Config.initialPackageConfig.toPackageConfig,
sv1Config.initialHoldingFee,
sv1Config.zeroTransferFees,
sv1Config.initialTransferPreapprovalFee,
sv1Config.initialFeaturedAppActivityMarkerAmount,
developmentFundPercentage =
if (developmentFund.supported) sv1Config.developmentFundPercentage else None,
)
sv1SynchronizerNodes <- SvUtil.getSV1SynchronizerNodeConfig(
cometBftNode,
localSynchronizerNode,
Expand Down
28 changes: 14 additions & 14 deletions daml/dars.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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 2ddc31f55019af89d78fa91103ffb31bc10b5b12877f38d3edb60736d07ecd04
splice-amulet 0.1.15 67fac2f853bce8dbf0b9817bb5ba7c59f10e8120b7c808696f7010e5f0c8a791
splice-amulet 0.1.2 1446ffdf23326cef2de97923df96618eb615792bea36cf1431f03639448f1645
splice-amulet 0.1.3 0d89016d5a90eb8bced48bbac99e81c57781b3a36094b8d48b8e4389851e19af
splice-amulet 0.1.4 a36ef8888fb44caae13d96341ce1fabd84fc9e2e7b209bbc3caabb48b6be1668
Expand All @@ -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 0ae7ab05870ee248d29f8c65bc6b9a50b17612f7ef1e15496df93ed5ba8c5a80
splice-amulet-name-service 0.1.16 53468a38bce11b51cd2ed10b9c09301c0b73570b50896d5649c4629de15815a3
splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b92f066c865dbdeeabb
splice-amulet-name-service 0.1.3 beb4b85f3f0cf36dfb93fc917d3ac218ee5d41b6e70604720cb228d85e168ee0
splice-amulet-name-service 0.1.4 053c7f4c2a77312e7d465a4fa7dc8cb298754ad12c0c987a7c401bd724e65efc
Expand All @@ -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 8d844bbfca3dec0e659a3a1ef9877e62b17340c6b75d75f9ab53528ecc625e44
splice-amulet-test 0.1.18 d01f084b98a43820126fd24b4775c968f99c67b3d577ab943db1f898622931b5
splice-amulet-name-service-test 0.1.19 6542e39b3393da6895548049bed03208db77b274140557c9d9d3be13c77ec885
splice-amulet-test 0.1.18 a488e6bd06305296d918e1485abb8103e4984eacc09d0d5f558cac44e4f19e4f
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
Expand All @@ -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 f3cd6e52e90952fad11b2b829307d1731937baf1e93978992d0a43038960fc1f
splice-dso-governance 0.1.21 2d306cfe8cdb3daf2d21f84dfecc3e2f26a41504e58fe25cb7fe5cc65683d11f
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 7417f78304d202421bad040f400d8aa67e73336d77e2dd3270d98b4187d54a40
splice-token-standard-test 1.0.9 dd87d77d97144417eac96c9e7a2259c5904f8c0c0ad47df1fb1fdb685d926255
splice-dso-governance-test 0.1.25 a02cba80f1d2035184558614cc2030e7c714e6e549fbbb1e8180a5151ddc3913
splice-token-standard-test 1.0.9 7010184aafc43bd9db506e02e660593d8bcdd48972b136684b70284f036363db
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
Expand All @@ -80,9 +80,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 65357831d282f71fb531193777f5da0b4c44d4fe0c54a3f2e741b04764129352
splice-util-featured-app-proxies-test 1.0.7 f78f117532321b952ac8b6dc4a9c83659369d537be52d3f9a6950a87f12d8f43
splice-util-token-standard-wallet 1.0.0 1da198cb7968fa478cfa12aba9fdf128a63a8af6ab284ea6be238cf92a3733ac
splice-util-token-standard-wallet-test 1.0.2 a4a173b17f91a07769309f27dcf6c713e3627e2d9181fcaea9e813b168af58ba
splice-util-token-standard-wallet-test 1.0.2 b2d3452df2c64bda9ff0ecf11fa07ed61344415328ed08cb807938295232b134
splice-validator-lifecycle 0.1.0 cef96fac957362f1fc097120bd13686cac7f84fbc8053afa994a1f9214d9570c
splice-validator-lifecycle 0.1.1 1ddf05c96002914593c929848b786f34c753fb0be07717d1786be177a564aada
splice-validator-lifecycle 0.1.2 57e2f15f9755db1f00e51c52c319294264a21ad71c6bc1e7cd70db4b164c0aaa
Expand All @@ -98,7 +98,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 dbe329e62607aa9a1f25d1faad7b75f6782ae177271d61499a3c55144ffbbcd8
splice-wallet 0.1.15 fd57252dda29e3ce90028114c91b521cb661df5a9d6e87c41a9e91518215fa5b
splice-wallet 0.1.2 c162e08a4ec0428bfa870b6d9040989e575c74199c3a80558c62e03196dd5146
splice-wallet 0.1.3 2c35bb4f5084ea66db59717d21750bfd64c43147ef5fd5166615092d592a6917
splice-wallet 0.1.4 141dad2d33b6410b8e1c35a0c4f8f76cb691e4d9a4410ce89f33f373855317e1
Expand All @@ -114,7 +114,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 23620494e5861a9cb2ed77966ba452255256d9306d96f14146f95295c80f5f8e
splice-wallet-payments 0.1.15 f80fae7a9de9431854372a66c3ca78675f77b2f54ede65abdc1b1abdec707d21
splice-wallet-payments 0.1.2 775f5eb9c0249509adda5eb3ea4ee31bb953601168c18880df6f2ff09ec4298a
splice-wallet-payments 0.1.3 b953b3729c81a55e598a364be7d0c0574750df3de12a7a1b53a300f217cb5c5c
splice-wallet-payments 0.1.4 12177f54873c1094ea169874ad0d7838383fd137f302d16356e93f28dfbc0fcc
Expand All @@ -123,15 +123,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 4545a5fd96bf70b52aa5d898bbba993b2bd4dbfa98a086c27cadb38c541a9253
splice-wallet-test 0.1.18 f658717551440b5c05502aee61b834020c4490aef2e4edce118c45313d386f21
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 114dab13425c8dfa7dde597759c05f32d81583b2fe3f88c46e041a78d2fc38e7
splitwell 0.1.15 2f3d8a50f57e66af450c36556a09d04c1d9117b699720118b7bd302556805499
splitwell 0.1.2 778edd2c228c6b68198d4d033885b2d0dae7daaee55d7df3edd9dfdf1f10fbd0
splitwell 0.1.3 7cde068cde689584f86a2499689d5cb165264d96496721e24ac6fb909f770a58
splitwell 0.1.4 85557b86cd4f330f093915db1ea26eac5092de6b5ddae0690146f6059c89419b
Expand All @@ -140,4 +140,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 b7d8c934a90473b1ff805d35e5f2f985733ecd72c9b1980abfcf32d99c8fece4
splitwell-test 0.1.18 022ee9f4acf3c29af6abcc21ec8d5e3acac2dadfec123adfc97932b1f13348a6
Binary file modified daml/dars/splice-amulet-0.1.15.dar
Binary file not shown.
Binary file modified daml/dars/splice-amulet-name-service-0.1.16.dar
Binary file not shown.
Binary file modified daml/dars/splice-dso-governance-0.1.21.dar
Binary file not shown.
Binary file modified daml/dars/splice-wallet-0.1.15.dar
Binary file not shown.
Binary file modified daml/dars/splice-wallet-payments-0.1.15.dar
Binary file not shown.
Binary file modified daml/dars/splitwell-0.1.15.dar
Binary file not shown.
2 changes: 1 addition & 1 deletion daml/splice-amulet/daml/Splice/Issuance.daml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ computeIssuingRoundParameters tickDuration amuletPrice config summary =
issuancePerValidatorFaucetCoupon = validatorFaucetIssuance.issuancePerCoupon
optAmuletsToIssueToDevelopmentFund = Some amuletsToIssueToDevelopmentFund
where
developmentFundPercentage = fromOptional 0.0 config.optDevelopmentFundPercentage
developmentFundPercentage = fromOptional 0.05 config.optDevelopmentFundPercentage

amuletsToIssueToSvs =
adjustedAmuletsToIssueInRound
Expand Down
Loading
Loading