Merge pull request #5739 from ethereum-optimism/felipe/cache-fix-b

fix(proxyd): clean up cache initialization
This commit is contained in:
OptimismBot 2023-05-19 15:29:53 -07:00 committed by GitHub
commit 65e4deea8b
3 changed files with 1 additions and 21 deletions

@ -27,8 +27,6 @@ type ServerConfig struct {
type CacheConfig struct {
Enabled bool `toml:"enabled"`
BlockSyncRPCURL string `toml:"block_sync_rpc_url"`
NumBlockConfirmations int `toml:"num_block_confirmations"`
}
type RedisConfig struct {

@ -10,8 +10,6 @@ namespace = "proxyd"
[cache]
enabled = true
block_sync_rpc_url = "$GOOD_BACKEND_RPC_URL"
[backends]
[backends.good]

@ -9,7 +9,6 @@ import (
"time"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log"
"github.com/go-redis/redis/v8"
"github.com/prometheus/client_golang/prometheus/promhttp"
@ -206,27 +205,12 @@ func Start(config *Config) (*Server, func(), error) {
rpcCache RPCCache
)
if config.Cache.Enabled {
if config.Cache.BlockSyncRPCURL == "" {
return nil, nil, fmt.Errorf("block sync node required for caching")
}
blockSyncRPCURL, err := ReadFromEnvOrConfig(config.Cache.BlockSyncRPCURL)
if err != nil {
return nil, nil, err
}
if redisClient == nil {
log.Warn("redis is not configured, using in-memory cache")
cache = newMemoryCache()
} else {
cache = newRedisCache(redisClient, config.Redis.Namespace)
}
// Ideally, the BlocKSyncRPCURL should be the sequencer or a HA replica that's not far behind
ethClient, err := ethclient.Dial(blockSyncRPCURL)
if err != nil {
return nil, nil, err
}
defer ethClient.Close()
rpcCache = newRPCCache(newCacheWithCompression(cache))
}