diff --git a/config/coordinator/coordinator-docker.config.toml b/config/coordinator/coordinator-docker.config.toml index 7f484851..6865c99f 100644 --- a/config/coordinator/coordinator-docker.config.toml +++ b/config/coordinator/coordinator-docker.config.toml @@ -93,8 +93,6 @@ request-retry.backoff-delay="PT1S" request-retry.failures-warning-threshold=2 l1-query-block-tag="LATEST" l1-polling-interval="PT12S" -l1-request-retry.backoff-delay="PT1S" -l1-request-retry.failures-warning-threshold=2 [api] observability_port=9545 @@ -119,7 +117,7 @@ gas-price-cap-multiplier-for-finalization=2.0 # blocks are 2s, this may catch in between blocks send-message-event-polling-interval="PT1S" # 10 blocks worth at 2s per block -max-event-scraping-time="PT5S" +max-event-scraping-time="PT5S" # use by message anchoring service # An optional config to define the L1 block time with default as PT12S block-time="PT1S" # set the same as local L1 block time block-range-loop-limit=500 diff --git a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt index 4ef567b9..e6c74a96 100644 --- a/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt +++ b/coordinator/app/src/main/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfig.kt @@ -498,10 +498,6 @@ data class Type2StateProofProviderConfig( val endpoints: List, val l1QueryBlockTag: BlockParameter.Tag = BlockParameter.Tag.LATEST, val l1PollingInterval: Duration = Duration.ofSeconds(12), - val l1RequestRetry: RequestRetryConfigTomlFriendly = RequestRetryConfigTomlFriendly( - backoffDelay = Duration.ofSeconds(1), - failuresWarningThreshold = 3 - ), override val requestRetry: RequestRetryConfigTomlFriendly ) : RequestRetryConfigurable @@ -556,7 +552,8 @@ data class CoordinatorConfigTomlDto( api = api, l2Signer = l2Signer, messageAnchoringService = messageAnchoringService, - l2NetworkGasPricingService = if (!testL1Disabled) l2NetworkGasPricing.reified() else null, + l2NetworkGasPricingService = + if (testL1Disabled || l2NetworkGasPricing.disabled) null else l2NetworkGasPricing.reified(), l1DynamicGasPriceCapService = l1DynamicGasPriceCapService, testL1Disabled = testL1Disabled, proversConfig = prover.reified() diff --git a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt index 8a7dec63..717e917b 100644 --- a/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt +++ b/coordinator/app/src/test/kotlin/net/consensys/zkevm/coordinator/app/config/CoordinatorConfigTest.kt @@ -136,11 +136,7 @@ class CoordinatorConfigTest { failuresWarningThreshold = 2 ), l1QueryBlockTag = BlockParameter.Tag.SAFE, - l1PollingInterval = Duration.parse("PT6S"), - l1RequestRetry = RequestRetryConfigTomlFriendly( - backoffDelay = Duration.parse("PT0.5S"), - failuresWarningThreshold = 20 - ) + l1PollingInterval = Duration.parse("PT6S") ) private val stateManagerConfig = StateManagerClientConfig( version = "2.3.0", diff --git a/coordinator/app/src/test/resources/configs/coordinator.config.toml b/coordinator/app/src/test/resources/configs/coordinator.config.toml index 6bd74cdd..fa2af3d3 100644 --- a/coordinator/app/src/test/resources/configs/coordinator.config.toml +++ b/coordinator/app/src/test/resources/configs/coordinator.config.toml @@ -75,8 +75,6 @@ request-retry.backoff-delay="PT1S" request-retry.failures-warning-threshold=2 l1-query-block-tag="SAFE" l1-polling-interval="PT6S" -l1-request-retry.backoff-delay="PT0.5S" -l1-request-retry.failures-warning-threshold=20 [api] observability_port=9545