feat: enhance spec upgrade cache persistence with current spec version checks

Author: xlc

src/hooks/useNetworkState.ts

@@ -41,9 +41,10 @@ export const useNetworkState = () => {
   const specUpgradePromisesRef = useRef(new Map<string, Promise<UpgradeInfo>>())
   const apisRef = useRef(new Map<NetworkId, ApiPromise>())
   const pendingUpgradeRequestsRef = useRef(new Set<string>())
+  const currentSpecVersionsRef = useRef(new Map<NetworkId, number>())
 
   const persistCache = useCallback(() => {
-    persistSpecUpgradeCache(specUpgradeCacheRef.current, NETWORK_STORAGE_KEYS)
+    persistSpecUpgradeCache(specUpgradeCacheRef.current, NETWORK_STORAGE_KEYS, currentSpecVersionsRef.current)
   }, [])
 
   useEffect(() => {
@@ -372,6 +373,24 @@ export const useNetworkState = () => {
     }
   }, [connectNetwork])
 
+  useEffect(() => {
+    const specVersions = currentSpecVersionsRef.current
+    const seen = new Set<NetworkId>()
+
+    for (const [networkId, state] of Object.entries(networkState) as Array<[NetworkId, NetworkRowState | undefined]>) {
+      if (state?.specVersion != null) {
+        specVersions.set(networkId, state.specVersion)
+        seen.add(networkId)
+      }
+    }
+
+    for (const networkId of Array.from(specVersions.keys())) {
+      if (!seen.has(networkId)) {
+        specVersions.delete(networkId)
+      }
+    }
+  }, [networkState])
+
   useEffect(() => {
     if (cancelledRef.current) {
       return

src/specUpgradeCachePersistence.ts

@@ -14,23 +14,35 @@ const normalizeUpgrade = (upgrade: UpgradeInfo): UpgradeInfo => ({
   timestampMs: upgrade.timestampMs,
 })
 
-export const persistSpecUpgradeCache = (cache: Map<string, UpgradeInfo>, networkStorageKeys: Map<NetworkId, string>) => {
+export const persistSpecUpgradeCache = (
+  cache: Map<string, UpgradeInfo>,
+  networkStorageKeys: Map<NetworkId, string>,
+  currentSpecVersions?: Map<NetworkId, number>,
+) => {
   if (typeof window === 'undefined' || !window.localStorage) {
     return
   }
 
   try {
     const groupedByNetwork = new Map<NetworkId, Array<[number, UpgradeInfo]>>()
+    const staleCacheKeys: string[] = []
 
     for (const [cacheKey, upgradeInfo] of cache.entries()) {
       const separatorIndex = cacheKey.indexOf(':')
       if (separatorIndex === -1) {
+        staleCacheKeys.push(cacheKey)
         continue
       }
       const networkId = cacheKey.slice(0, separatorIndex) as NetworkId
       const specVersionValue = cacheKey.slice(separatorIndex + 1)
       const specVersion = parseSpecVersion(specVersionValue)
       if (specVersion == null) {
+        staleCacheKeys.push(cacheKey)
+        continue
+      }
+      const currentSpecVersion = currentSpecVersions?.get(networkId)
+      if (currentSpecVersion != null && specVersion !== currentSpecVersion) {
+        staleCacheKeys.push(cacheKey)
         continue
       }
       const entriesForNetwork = groupedByNetwork.get(networkId)
@@ -42,6 +54,10 @@ export const persistSpecUpgradeCache = (cache: Map<string, UpgradeInfo>, network
       }
     }
 
+    for (const cacheKey of staleCacheKeys) {
+      cache.delete(cacheKey)
+    }
+
     const persistedKeys = new Set<string>()
 
     for (const [networkId, entries] of groupedByNetwork) {