feat: validate internal state for persisted chainId

wevm · Aug 6, 2024 · 871dbdb · 871dbdb
1 parent b791610
commit 871dbdb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/.changeset/thin-fireants-turn.md b/.changeset/thin-fireants-turn.md
@@ -0,0 +1,5 @@
+---
+"@wagmi/core": patch
+---
+
+Added validation to internal state for persisted `chainId`.
diff --git a/packages/core/src/createConfig.ts b/packages/core/src/createConfig.ts
@@ -224,14 +224,10 @@ export function createConfig<
               if (version === currentVersion) return persistedState as State
 
               const initialState = getInitialState()
-              const chainId =
-                persistedState &&
-                typeof persistedState === 'object' &&
-                'chainId' in persistedState &&
-                typeof persistedState.chainId === 'number' &&
-                chains.getState().some((x) => x.id === persistedState.chainId)
-                  ? persistedState.chainId
-                  : initialState.chainId
+              const chainId = validatePersistedChainId(
+                persistedState,
+                initialState.chainId,
+              )
               return { ...initialState, chainId }
             },
             name: 'store',
@@ -260,9 +256,15 @@ export function createConfig<
                 'status' in persistedState
               )
                 delete persistedState.status
+              // Make sure persisted `chainId` is valid
+              const chainId = validatePersistedChainId(
+                persistedState,
+                currentState.chainId,
+              )
               return {
                 ...currentState,
                 ...(persistedState as object),
+                chainId,
               }
             },
             skipHydration: ssr,
@@ -273,6 +275,19 @@ export function createConfig<
     ),
   )
 
+  function validatePersistedChainId(
+    persistedState: unknown,
+    defaultChainId: number,
+  ) {
+    return persistedState &&
+      typeof persistedState === 'object' &&
+      'chainId' in persistedState &&
+      typeof persistedState.chainId === 'number' &&
+      chains.getState().some((x) => x.id === persistedState.chainId)
+      ? persistedState.chainId
+      : defaultChainId
+  }
+
   /////////////////////////////////////////////////////////////////////////////////////////////////
   // Subscribe to changes
   /////////////////////////////////////////////////////////////////////////////////////////////////