rm ZkSyncCallLimitValidator (#584)

* rm ZkSyncCallLimitValidator * Revert "rm ZkSyncCallLimitValidator" This reverts commit 08ebf2c. * rm ZkSyncCallLimitValidator
drpcorg · Oct 29, 2024 · d628c33 · d628c33
1 parent cc5531b
commit d628c33
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 35 deletions.
diff --git a/foundation/src/main/resources/public b/foundation/src/main/resources/public
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumChainSpecific.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumChainSpecific.kt
@@ -153,19 +153,17 @@ object EthereumChainSpecific : AbstractPollChainSpecific() {
         options: Options,
         config: ChainConfig,
     ): List<SingleValidator<ValidateUpstreamSettingsResult>> {
-        val limitValidator = callLimitValidatorFactory(upstream, options, config, chain)
-
         val validators = mutableListOf(
             ChainIdValidator(upstream, chain),
             OldBlockValidator(upstream),
         )
+        val limitValidator = EthCallLimitValidator(upstream, options, config)
         if (limitValidator.isEnabled()) {
             validators.add(limitValidator)
         }
         if (options.validateGasPrice) {
             validators.add(GasPriceValidator(upstream, config))
         }
-
         return validators
     }
 

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt
@@ -113,37 +113,6 @@ class EthCallLimitValidator(
         err.message != null && err.message!!.contains("rpc.returndata.limit")
 }
 
-class ZkSyncCallLimitValidator(
-    private val upstream: Upstream,
-    private val options: ChainOptions.Options,
-) : AbstractCallLimitValidator(upstream, options) {
-    private val method = "debug_traceBlockByNumber"
-
-    override fun isEnabled() =
-        options.validateCallLimit && upstream.getMethods().getSupportedMethods().contains(method)
-
-    override fun createRequest() = ChainRequest(
-        method,
-        ListParams("0x1b73b2b", mapOf("tracer" to "callTracer")),
-    )
-
-    override fun isLimitError(err: Throwable): Boolean =
-        err.message != null && err.message!!.contains("response size should not greater than")
-}
-
-fun callLimitValidatorFactory(
-    upstream: Upstream,
-    options: ChainOptions.Options,
-    config: ChainConfig,
-    chain: Chain,
-): CallLimitValidator {
-    return if (listOf(Chain.ZKSYNC__MAINNET).contains(chain)) {
-        ZkSyncCallLimitValidator(upstream, options)
-    } else {
-        EthCallLimitValidator(upstream, options, config)
-    }
-}
-
 class ChainIdValidator(
     private val upstream: Upstream,
     private val chain: Chain,
+1 −0		CODEOWNERS
+10 −4		chain_descriptions.tsx
+1 −2		chains.yaml
+201 −148		getFAQ.tsx
+ −		icons/Lens.png
+58 −0		icons/Sonic.svg
+ −		icons/Ton.png
+6 −0		icons/getChainIcon.ts
+1 −0		top-banner/TopBannerIcon.svg
+6 −0		top-banner/data.json