Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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 @@ -62,6 +62,13 @@ class PruningIntegrationTest
)(config),
(_, config) =>
config.copy(
svApps = config.svApps.updatedWith(InstanceName.tryCreate("sv1")) {
_.map { config =>
config.copy(acsCommitmentReconciliationInterval =
PositiveDurationSeconds.ofSeconds(15)
)
}
},
validatorApps =
config.validatorApps.updatedWith(InstanceName.tryCreate("sv1Validator")) {
_.map { config =>
Expand All @@ -70,8 +77,8 @@ class PruningIntegrationTest
participantPruningSchedule = Some(
PruningConfig(
"0 /1 * * * ?",
PositiveDurationSeconds.tryFromDuration(1.seconds),
PositiveDurationSeconds.tryFromDuration(1.seconds),
PositiveDurationSeconds.tryFromDuration(2.seconds),
PositiveDurationSeconds.tryFromDuration(5.seconds),
)
)
)
Expand All @@ -97,7 +104,7 @@ class PruningIntegrationTest
.withPausedTrigger[ReconcileSequencerConnectionsTrigger],
)
}
)
),
),
)

Expand All @@ -110,8 +117,8 @@ class PruningIntegrationTest
sv1ValidatorBackend.participantClient.pruning.get_schedule() shouldBe Some(
PruningSchedule(
"0 /1 * * * ?",
PositiveDurationSeconds.tryFromDuration(1.seconds),
PositiveDurationSeconds.tryFromDuration(1.seconds),
PositiveDurationSeconds.tryFromDuration(2.seconds),
PositiveDurationSeconds.tryFromDuration(5.seconds),
)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import org.lfdecentralizedtrust.splice.config.{
}
import org.lfdecentralizedtrust.splice.environment.{DarResource, DarResources}
import org.lfdecentralizedtrust.splice.sv.SvAppClientConfig
import org.lfdecentralizedtrust.splice.sv.util.SvUtil
import org.lfdecentralizedtrust.splice.util.SpliceUtil

import java.nio.file.Path
Expand Down Expand Up @@ -320,6 +321,11 @@ case class SvAppBackendConfig(
// Defaults to 24h to allow for 24h between preparation and execution of an externally signed transaction
preparationTimeRecordTimeTolerance: NonNegativeFiniteDuration =
NonNegativeFiniteDuration.ofHours(24),
// We set the reconciliation interval for ACS commitments to 30 mins by default to ensure that
// frequent ACS commitments do not eat up the base rate traffic and prevent validators from topping up
// (See #12107).
acsCommitmentReconciliationInterval: PositiveDurationSeconds =
PositiveDurationSeconds.ofMinutes(30),
// Defaults to 48h as it must be at least 2x preparationTimeRecordtimeTolerance
mediatorDeduplicationTimeout: NonNegativeFiniteDuration = NonNegativeFiniteDuration.ofHours(48),
// We want to be able to override this for simtime tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ class SV1Initializer(
val values = initialValues.tryUpdate(
trafficControlParameters = Some(initialTrafficControlParameters),
reconciliationInterval =
PositiveSeconds.fromConfig(SvUtil.defaultAcsCommitmentReconciliationInterval),
PositiveSeconds.fromConfig(config.acsCommitmentReconciliationInterval),
acsCommitmentsCatchUp = Some(SvUtil.defaultAcsCommitmentsCatchUpParameters),
preparationTimeRecordTimeTolerance =
NonNegativeFiniteDuration.fromConfig(config.preparationTimeRecordTimeTolerance),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ object SvUtil {
// Assumption: the sv1 node is run by the foundation
val DefaultSV1Weight: Long = 10_000L

// We set the reconciliation interval for ACS commitments to 30 mins by default to ensure that
// frequent ACS commitments do not eat up the base rate traffic and prevent validators from topping up
// (See #12107).
val defaultAcsCommitmentReconciliationInterval: PositiveDurationSeconds =
PositiveDurationSeconds.ofMinutes(30)
val defaultAcsCommitmentsCatchUpParameters: AcsCommitmentsCatchUpParameters =
AcsCommitmentsCatchUpParameters(
// With the default reconciliation interval of 30m this corresponds to a catchup interval of 30m * 24 = 12 hours.
Expand Down
Loading