ethereum as generic upstream

drpcorg · Oct 30, 2023 · 6fc964e · 6fc964e
1 parent 4ea4fa5
commit 6fc964e
Show file tree

Hide file tree

Showing 39 changed files with 526 additions and 2,190 deletions.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/cache/CachesFactory.kt b/src/main/kotlin/io/emeraldpay/dshackle/cache/CachesFactory.kt
@@ -97,7 +97,6 @@ open class CachesFactory(
             caches.setReceipts(ReceiptRedisCache(redis.reactive(), chain))
             caches.setHeightByHash(HeightByHashRedisCache(redis.reactive(), chain))
         }
-        caches.setCacheEnabled(cacheConfig.requestsCacheEnabled)
         return caches.build()
     }
 

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/config/CacheConfig.kt b/src/main/kotlin/io/emeraldpay/dshackle/config/CacheConfig.kt
@@ -17,8 +17,6 @@ package io.emeraldpay.dshackle.config
 
 class CacheConfig {
 
-    var requestsCacheEnabled = true
-
     var redis: Redis? = null
 
     class Redis(

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/config/CacheConfigReader.kt b/src/main/kotlin/io/emeraldpay/dshackle/config/CacheConfigReader.kt
@@ -16,21 +16,13 @@
 package io.emeraldpay.dshackle.config
 
 import io.emeraldpay.dshackle.foundation.YamlConfigReader
-import org.slf4j.LoggerFactory
 import org.yaml.snakeyaml.nodes.MappingNode
 
 class CacheConfigReader : YamlConfigReader<CacheConfig>() {
 
-    companion object {
-        private val log = LoggerFactory.getLogger(CacheConfigReader::class.java)
-    }
-
     override fun read(input: MappingNode?): CacheConfig? {
         return getMapping(input, "cache")?.let { node ->
             val config = CacheConfig()
-            getValueAsBool(node, "requests-cache-enabled")?.let {
-                config.requestsCacheEnabled = it
-            }
             getMapping(node, "redis")?.let { redisNode ->
                 val redis = CacheConfig.Redis()
                 val enabled = getValueAsBool(redisNode, "enabled") ?: true
@@ -50,7 +42,7 @@ class CacheConfigReader : YamlConfigReader<CacheConfig>() {
                     config.redis = redis
                 }
             }
-            if (config.redis == null && config.requestsCacheEnabled) {
+            if (config.redis == null) {
                 return null
             }
             config

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/config/context/MultistreamsConfig.kt b/src/main/kotlin/io/emeraldpay/dshackle/config/context/MultistreamsConfig.kt
@@ -2,16 +2,12 @@ package io.emeraldpay.dshackle.config.context
 
 import io.emeraldpay.dshackle.BlockchainType
 import io.emeraldpay.dshackle.BlockchainType.BITCOIN
-import io.emeraldpay.dshackle.BlockchainType.EVM_POS
-import io.emeraldpay.dshackle.BlockchainType.EVM_POW
-import io.emeraldpay.dshackle.BlockchainType.STARKNET
 import io.emeraldpay.dshackle.Chain
 import io.emeraldpay.dshackle.cache.CachesFactory
 import io.emeraldpay.dshackle.upstream.CallTargetsHolder
 import io.emeraldpay.dshackle.upstream.Multistream
 import io.emeraldpay.dshackle.upstream.bitcoin.BitcoinMultistream
-import io.emeraldpay.dshackle.upstream.ethereum.EthereumMultistream
-import io.emeraldpay.dshackle.upstream.ethereum.EthereumPosMultiStream
+import io.emeraldpay.dshackle.upstream.generic.ChainSpecificRegistry
 import io.emeraldpay.dshackle.upstream.generic.GenericMultistream
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory
@@ -31,14 +27,13 @@ open class MultistreamsConfig(val beanFactory: ConfigurableListableBeanFactory)
         headScheduler: Scheduler,
         tracer: Tracer,
     ): List<Multistream> {
-        return Chain.values()
+        return Chain.entries
             .filterNot { it == Chain.UNSPECIFIED }
             .map { chain ->
-                when (BlockchainType.from(chain)) {
-                    EVM_POS -> ethereumPosMultistream(chain, cachesFactory, headScheduler, tracer)
-                    EVM_POW -> ethereumMultistream(chain, cachesFactory, headScheduler, tracer)
-                    BITCOIN -> bitcoinMultistream(chain, cachesFactory, headScheduler)
-                    STARKNET -> genericMultistream(chain, cachesFactory, headScheduler)
+                if (BlockchainType.from(chain) == BITCOIN) {
+                    bitcoinMultistream(chain, cachesFactory, headScheduler)
+                } else {
+                    genericMultistream(chain, cachesFactory, headScheduler, tracer)
                 }
             }
     }
@@ -47,47 +42,18 @@ open class MultistreamsConfig(val beanFactory: ConfigurableListableBeanFactory)
         chain: Chain,
         cachesFactory: CachesFactory,
         headScheduler: Scheduler,
+        tracer: Tracer,
     ): Multistream {
         val name = "multi-$chain"
+        val cs = ChainSpecificRegistry.resolve(chain)
         return GenericMultistream(
             chain,
             CopyOnWriteArrayList(),
             cachesFactory.getCaches(chain),
             headScheduler,
-        ).also { register(it, name) }
-    }
-
-    private fun ethereumMultistream(
-        chain: Chain,
-        cachesFactory: CachesFactory,
-        headScheduler: Scheduler,
-        tracer: Tracer,
-    ): EthereumMultistream {
-        val name = "multi-ethereum-$chain"
-
-        return EthereumMultistream(
-            chain,
-            CopyOnWriteArrayList(),
-            cachesFactory.getCaches(chain),
-            headScheduler,
-            tracer,
-        ).also { register(it, name) }
-    }
-
-    open fun ethereumPosMultistream(
-        chain: Chain,
-        cachesFactory: CachesFactory,
-        headScheduler: Scheduler,
-        tracer: Tracer,
-    ): EthereumPosMultiStream {
-        val name = "multi-ethereum-pos-$chain"
-
-        return EthereumPosMultiStream(
-            chain,
-            CopyOnWriteArrayList(),
-            cachesFactory.getCaches(chain),
-            headScheduler,
-            tracer,
+            cs.makeCachingReaderBuilder(tracer),
+            cs::localReaderBuilder,
+            cs.subscriptionBuilder(headScheduler),
         ).also { register(it, name) }
     }
 

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt
@@ -76,7 +76,6 @@ open class NativeCall(
     private val log = LoggerFactory.getLogger(NativeCall::class.java)
     private val objectMapper: ObjectMapper = Global.objectMapper
 
-    private val localRouterEnabled = config.cache?.requestsCacheEnabled ?: true
     private val passthrough = config.passthrough
 
     var rpcReaderFactory: RpcReaderFactory = RpcReaderFactory.default()
@@ -359,7 +358,7 @@ open class NativeCall(
         if (method in DefaultEthereumMethods.newFilterMethods) CreateFilterDecorator() else NoneResultDecorator()
 
     fun fetch(ctx: ValidCallContext<ParsedCallDetails>): Mono<CallResult> {
-        return ctx.upstream.getLocalReader(localRouterEnabled)
+        return ctx.upstream.getLocalReader()
             .flatMap { api ->
                 SpannedReader(api, tracer, LOCAL_READER)
                     .read(JsonRpcRequest(ctx.payload.method, ctx.payload.params, ctx.nonce, ctx.forwardedSelector))