feat: protect state

packages/connectors/src/injected.ts

@@ -147,15 +147,15 @@ export function injected(parameters: InjectedParameters = {}) {
         const canSelectAccount = getWindowProvider().features?.includes(
           'wallet_requestPermissions',
         )
-        let accounts: readonly Address[] | null = null
-        if (
-          canSelectAccount &&
+        const isDisconnected =
           shimDisconnect &&
           !config.storage?.getItem(this.shimDisconnectStorageKey)
-        ) {
+
+        let accounts: readonly Address[] | null = null
+        if (canSelectAccount && isDisconnected) {
           accounts = await this.getAccounts().catch(() => null)
-          const isConnected = !!accounts?.length
-          if (isConnected)
+          const isAuthorized = !!accounts?.length
+          if (isAuthorized)
             // Attempt to show another prompt for selecting wallet if already connected
             try {
               const permissions = await provider.request({
@@ -248,12 +248,11 @@ export function injected(parameters: InjectedParameters = {}) {
     },
     async isAuthorized() {
       try {
-        if (
+        const isDisconnected =
           shimDisconnect &&
           // If shim does not exist in storage, wallet is disconnected
           !config.storage?.getItem(this.shimDisconnectStorageKey)
-        )
-          return false
+        if (isDisconnected) return false
 
         const provider = await this.getProvider()
         if (!provider) {

packages/core/src/createConfig.ts

@@ -314,9 +314,15 @@ export function createConfig<
 
     getClient,
     setState(value) {
-      // TODO: Add check to make sure state isn't completely nuked (e.g. set to non-object) and important keys exist
-      const newState =
-        typeof value === 'function' ? value(store.getState() as any) : value
+      let newState: State
+      if (typeof value === 'function') newState = value(store.getState() as any)
+      else newState = value
+
+      // Reset state if it got set to something not matching the base state
+      if (typeof newState !== 'object') newState = initialState
+      const isCorrupt = Object.keys(initialState).some((x) => !(x in newState))
+      if (isCorrupt) newState = initialState
+
       store.setState(newState, true)
     },
     subscribe(selector, listener, options) {