fix: disable peer discovery, remove explicit token registry cache cleanup.

Mateusz Czeladka · Mateusz Czeladka · commit 7dc001530022 · 2025-09-25T11:47:34.000+02:00
diff --git a/.env.IntegrationTest b/.env.IntegrationTest
@@ -158,8 +158,8 @@ PEER_DISCOVERY=false
 TOKEN_REGISTRY_ENABLED=false
 TOKEN_REGISTRY_BASE_URL=https://tokens.cardano.org/api
 TOKEN_REGISTRY_CACHE_TTL_HOURS=12
-TOKEN_REGISTRY_CACHE_CLEAR_RATE=15m
 TOKEN_REGISTRY_LOGO_FETCH=false
+TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS=2
 
 ## Mithril version for Docker build
 MITHRIL_VERSION=2524.0
diff --git a/.env.docker-compose b/.env.docker-compose
@@ -109,12 +109,12 @@ CONTINUE_PARSING_ON_ERROR=true
 SYNC=true
 
 ## Peer Discovery
-PEER_DISCOVERY=true
+PEER_DISCOVERY=false
 
 ## Token Registry
 # Token registry is enabled for mainnet
 TOKEN_REGISTRY_ENABLED=true
 TOKEN_REGISTRY_BASE_URL=https://tokens.cardano.org/api
 TOKEN_REGISTRY_CACHE_TTL_HOURS=12
-TOKEN_REGISTRY_CACHE_CLEAR_RATE=15m
 TOKEN_REGISTRY_LOGO_FETCH=false
+TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS=2
diff --git a/.env.docker-compose-preprod b/.env.docker-compose-preprod
@@ -116,5 +116,5 @@ PEER_DISCOVERY=true
 TOKEN_REGISTRY_ENABLED=true
 TOKEN_REGISTRY_BASE_URL=http://preview.integrations.cf-systems.internal:8080/api
 TOKEN_REGISTRY_CACHE_TTL_HOURS=1
-TOKEN_REGISTRY_CACHE_CLEAR_RATE=15m
 TOKEN_REGISTRY_LOGO_FETCH=true
+TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS=2
diff --git a/.env.h2 b/.env.h2
@@ -109,5 +109,5 @@ SYNC=false
 TOKEN_REGISTRY_ENABLED=false
 TOKEN_REGISTRY_BASE_URL=https://tokens.cardano.org/api
 TOKEN_REGISTRY_CACHE_TTL_HOURS=12
-TOKEN_REGISTRY_CACHE_CLEAR_RATE=15m
 TOKEN_REGISTRY_LOGO_FETCH=false
+TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS=2
diff --git a/.env.h2-testdata b/.env.h2-testdata
@@ -110,5 +110,5 @@ SYNC=false
 TOKEN_REGISTRY_ENABLED=false
 TOKEN_REGISTRY_BASE_URL=https://tokens.cardano.org/api
 TOKEN_REGISTRY_CACHE_TTL_HOURS=12
-TOKEN_REGISTRY_CACHE_CLEAR_RATE=15m
 TOKEN_REGISTRY_LOGO_FETCH=false
+TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS=2
diff --git a/api/src/main/java/org/cardanofoundation/rosetta/client/CachingTokenRegistryHttpGatewayImpl.java b/api/src/main/java/org/cardanofoundation/rosetta/client/CachingTokenRegistryHttpGatewayImpl.java
@@ -7,9 +7,11 @@
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.cardanofoundation.rosetta.client.model.domain.*;
+import org.cardanofoundation.rosetta.client.model.domain.TokenCacheEntry;
+import org.cardanofoundation.rosetta.client.model.domain.TokenRegistryBatchRequest;
+import org.cardanofoundation.rosetta.client.model.domain.TokenRegistryBatchResponse;
+import org.cardanofoundation.rosetta.client.model.domain.TokenSubject;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -35,7 +37,7 @@ public class CachingTokenRegistryHttpGatewayImpl implements TokenRegistryHttpGat
     @Value("${cardano.rosetta.TOKEN_REGISTRY_BASE_URL:https://tokens.cardano.org/api}")
     protected String tokenRegistryBaseUrl;
 
-    @Value("${cardano.rosetta.HTTP_REQUEST_TIMEOUT_SECONDS:2}") // aggressive timeout as we do not want to block the request
+    @Value("${cardano.rosetta.TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS:2}") // aggressive timeout as we do not want to block the request
     protected int httpRequestTimeoutSeconds;
 
     @Value("${cardano.rosetta.TOKEN_REGISTRY_LOGO_FETCH:false}")
@@ -84,7 +86,7 @@ public Map<String, Optional<TokenSubject>> getTokenMetadataBatch(@NonNull Set<St
             return result;
         }
 
-        log.info("Initiating remote token registry request for {} subjects", subjectsToFetch.size());
+        log.info("Initiating remote token registry HTTP POST request: {} for {} subjects", batchEndpointUrl, subjectsToFetch.size());
         log.debug("Subjects to fetch from token registry: {}", subjectsToFetch);
 
         Stopwatch stopwatch = Stopwatch.createStarted();
@@ -162,17 +164,12 @@ public Map<String, Optional<TokenSubject>> getTokenMetadataBatch(@NonNull Set<St
         }
     }
 
+    /** helper for testing */
     void evictFromCache(String subject) {
         tokenMetadataCache.invalidate(subject);
         log.debug("Evicted cache entry for subject: {}", subject);
     }
 
-    @Scheduled(fixedRateString = "${cardano.rosetta.TOKEN_REGISTRY_CACHE_CLEAR_RATE:15m}")
-    void clearCache() {
-        tokenMetadataCache.invalidateAll();
-        log.info("Cleared all token metadata cache entries.");
-    }
-
     List<String> buildPropertiesList() {
         List<String> properties = new ArrayList<>();
         
diff --git a/api/src/main/java/org/cardanofoundation/rosetta/config/CacheConfig.java b/api/src/main/java/org/cardanofoundation/rosetta/config/CacheConfig.java
@@ -23,7 +23,7 @@ public ConcurrentMapCacheManager cacheManager() {
   //a cache for token metadata from token registry
   @Bean
   public Cache<String, TokenCacheEntry> tokenMetadataCache(
-      @Value("${cardano.rosetta.TOKEN_REGISTRY_CACHE_TTL_HOURS:1}") int cacheTtlHours) {
+      @Value("${cardano.rosetta.TOKEN_REGISTRY_CACHE_TTL_HOURS:12}") int cacheTtlHours) {
     return CacheBuilder.newBuilder()
         .maximumSize(10_000) // Maximum 10k cached entries
         .expireAfterWrite(cacheTtlHours, HOURS)
diff --git a/api/src/main/resources/config/application-online.yaml b/api/src/main/resources/config/application-online.yaml
@@ -45,4 +45,3 @@ cardano:
     TOKEN_REGISTRY_ENABLED: ${TOKEN_REGISTRY_ENABLED:true}
     TOKEN_REGISTRY_BASE_URL: ${TOKEN_REGISTRY_BASE_URL:https://tokens.cardano.org/api}
     TOKEN_REGISTRY_CACHE_TTL_HOURS: ${TOKEN_REGISTRY_CACHE_TTL_HOURS:1}
-    TOKEN_REGISTRY_CACHE_CLEAR_RATE: ${TOKEN_REGISTRY_CACHE_CLEAR_RATE:15m}
diff --git a/api/src/main/resources/config/application.yaml b/api/src/main/resources/config/application.yaml
@@ -52,8 +52,8 @@ cardano:
     TOKEN_REGISTRY_ENABLED: ${TOKEN_REGISTRY_ENABLED:true}
     TOKEN_REGISTRY_BASE_URL: ${TOKEN_REGISTRY_BASE_URL:https://tokens.cardano.org/api}
     TOKEN_REGISTRY_CACHE_TTL_HOURS: ${TOKEN_REGISTRY_CACHE_TTL_HOURS:1}
-    TOKEN_REGISTRY_CACHE_CLEAR_RATE: ${TOKEN_REGISTRY_CACHE_CLEAR_RATE:15m}
     TOKEN_REGISTRY_LOGO_FETCH: ${TOKEN_REGISTRY_LOGO_FETCH:false}
+    TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS: ${TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS:2}
 
 logging:
   level:
diff --git a/docker-compose-api.yaml b/docker-compose-api.yaml
@@ -52,8 +52,8 @@ services:
       TOKEN_REGISTRY_ENABLED: ${TOKEN_REGISTRY_ENABLED}
       TOKEN_REGISTRY_BASE_URL: ${TOKEN_REGISTRY_BASE_URL}
       TOKEN_REGISTRY_CACHE_TTL_HOURS: ${TOKEN_REGISTRY_CACHE_TTL_HOURS}
-      TOKEN_REGISTRY_CACHE_CLEAR_RATE: ${TOKEN_REGISTRY_CACHE_CLEAR_RATE}
       TOKEN_REGISTRY_LOGO_FETCH: ${TOKEN_REGISTRY_LOGO_FETCH}
+      TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS: ${TOKEN_REGISTRY_REQUEST_TIMEOUT_SECONDS}
 
     volumes:
       - ${CARDANO_CONFIG}:/config
diff --git a/docs/docs/install-and-deploy/env-vars.md b/docs/docs/install-and-deploy/env-vars.md
@@ -89,7 +89,6 @@ Within root folder of the project there are example `.env` files, which can be c
 | `TOKEN_REGISTRY_ENABLED`                      | Enable token registry integration for native token metadata           | true                                   | added in release 1.4.0  |
 | `TOKEN_REGISTRY_BASE_URL`                     | Base URL for the token registry API                                   | https://tokens.cardano.org/api         | added in release 1.4.0  |
 | `TOKEN_REGISTRY_CACHE_TTL_HOURS`              | Cache TTL for token metadata in hours                                 | 1                                      | added in release 1.4.0  |
-| `TOKEN_REGISTRY_CACHE_CLEAR_RATE`             | Scheduled rate for clearing token metadata cache (Spring format)      | 15m                                    | added in release 1.4.0  |
 | `TOKEN_REGISTRY_LOGO_FETCH`                   | Enable fetching token logos from registry (increases response size)   | false                                  | added in release 1.4.0  |
 
 ## Deprecated Environment Variables (Previous Versions)
