diff --git a/src/main/kotlin/io/emeraldpay/dshackle/Defaults.kt b/src/main/kotlin/io/emeraldpay/dshackle/Defaults.kt index d54f9e54..571cb854 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/Defaults.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/Defaults.kt @@ -23,7 +23,7 @@ class Defaults { companion object { const val maxMessageSize: Int = 32 * 1024 * 1024 const val maxMetadataSize = 16384 - val timeout: Duration = Duration.ofSeconds(60) + val timeout: Duration = Duration.ofSeconds(85) val timeoutInternal: Duration = timeout.dividedBy(4) val internalCallsTimeout = Duration.ofSeconds(5) val retryConnection: Duration = Duration.ofSeconds(10) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/WebsocketPendingTxes.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/WebsocketPendingTxes.kt index 15f67d0b..4ff3168f 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/WebsocketPendingTxes.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/WebsocketPendingTxes.kt @@ -37,7 +37,7 @@ class WebsocketPendingTxes( override fun createConnection(): Flux { return wsSubscriptions.subscribe(ChainRequest("eth_subscribe", ListParams(EthereumEgressSubscription.METHOD_PENDING_TXES))) .data - .timeout(Duration.ofSeconds(60), Mono.empty()) + .timeout(Duration.ofSeconds(85), Mono.empty()) .map { // comes as a JS string, i.e., within quotes val value = ByteArray(it.size - 2) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericIngressSubscription.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericIngressSubscription.kt index d784318a..40568cfa 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericIngressSubscription.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericIngressSubscription.kt @@ -47,9 +47,9 @@ class GenericSubscriptionConnect( return conn.subscribe(ChainRequest(topic, ListParams(getParams(params) as List))) .data .timeout( - Duration.ofSeconds(60), + Duration.ofSeconds(85), Mono.empty().doOnEach { - log.warn("Timeout during subscription to $topic") + log.warn("Timeout during subscription to $topic after 85 seconds") }, ) .onErrorResume {