feat: wire up hdwallet-gridplus safecard validation

.yarnrc.yml

@@ -1,6 +1,8 @@
 nodeLinker: node-modules
 
-npmRegistryServer: "https://registry.npmjs.org"
+npmAuthToken: "${NPM_AUTH-fallback}"
+
+npmRegistryServer: "http://127.0.0.1:4873"
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
@@ -15,4 +17,3 @@ unsafeHttpWhitelist:
   - 127.0.0.1
 
 yarnPath: .yarn/releases/yarn-3.5.0.cjs
-npmAuthToken: ${NPM_AUTH-fallback}

gridplus-safecard-validation.md

@@ -0,0 +1,60 @@
+# GridPlus SafeCard Validation
+
+## Problem
+
+Previously, ShapeShift operated on a "trust me bro" basis when handling GridPlus SafeCards. The app would:
+- Store SafeCards using app-generated UUIDs only
+- Never validate which physical SafeCard was actually inserted
+- Allow users to connect the wrong SafeCard without detection
+- Proceed with signing transactions without verifying the correct card was present
+
+This could lead to confusing UX where users might accidentally use the wrong wallet or end up in weird app states.
+
+## Solution
+
+Implement hardware-based wallet UID validation at three critical points:
+
+### 1. Initial Pairing
+When a user first pairs a SafeCard, we now:
+- Fetch the hardware wallet UID from the device (32-byte identifier from firmware)
+- Store this UID alongside the user's SafeCard in Redux state
+- Use this UID as the source of truth for that SafeCard
+
+### 2. Reconnection
+When the app loads and finds a GridPlus wallet from a previous session, we now:
+- Validate that the inserted SafeCard's UID matches the expected stored UID
+- Reject the connection if the wrong SafeCard is inserted
+- Provide clear error messages to guide users to insert the correct card
+
+### 3. Just-In-Time (JIT) Signing Validation
+Before every signing operation (transaction, message, typed data), we now:
+- Re-validate that the correct SafeCard is still inserted
+- Prevent signing if the SafeCard was swapped after connection
+- Support all chains: Ethereum, Bitcoin, Solana, Cosmos, Thorchain, Mayachain
+
+## Implementation
+
+### hdwallet Package Changes (shapeshift/hdwallet)
+Added to `GridPlusHDWallet` class:
+- `setExpectedWalletUid(walletUid: string)`: Configure expected UID for validation
+- `validateActiveWallet(expectedUid?: string)`: Fetch current wallet UID and validate
+- Private `validateBeforeSigning()`: Called before all signing methods
+
+### Web Changes (shapeshift/web)
+- **WalletProvider reconnection**: Validates SafeCard on app load
+- **finalizeWalletSetup**: Sets expected UID after connection for JIT validation
+- **GridPlus utils**: Wire up validation through connection flow
+- **Redux state**: Store `walletUid` and `isExternal` flag per SafeCard
+
+## User Experience
+
+Users will now see clear feedback when:
+- They try to reconnect with the wrong SafeCard inserted
+- They swap SafeCards after connecting but before signing
+- Legacy SafeCards without stored UIDs (requires cache clear to use)
+
+This ensures the app state always matches the physical hardware, preventing confusion and improving overall UX.
+
+## Migration
+
+No data migration provided. Users with existing SafeCards will need to clear their cache and re-pair their devices. This is a one-time operation that establishes the UID mapping for future sessions.

package.json

@@ -100,24 +100,24 @@
     "@shapeshiftoss/chain-adapters": "workspace:^",
     "@shapeshiftoss/contracts": "workspace:^",
     "@shapeshiftoss/errors": "workspace:^",
-    "@shapeshiftoss/hdwallet-coinbase": "1.62.10",
-    "@shapeshiftoss/hdwallet-core": "1.62.10",
-    "@shapeshiftoss/hdwallet-gridplus": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.10",
-    "@shapeshiftoss/hdwallet-keplr": "1.62.10",
-    "@shapeshiftoss/hdwallet-ledger": "1.62.10",
-    "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.10",
-    "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.10",
-    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.10",
-    "@shapeshiftoss/hdwallet-native": "1.62.10",
-    "@shapeshiftoss/hdwallet-native-vault": "1.62.10",
-    "@shapeshiftoss/hdwallet-phantom": "1.62.10",
-    "@shapeshiftoss/hdwallet-trezor": "1.62.10",
-    "@shapeshiftoss/hdwallet-trezor-connect": "1.62.10",
-    "@shapeshiftoss/hdwallet-vultisig": "1.62.10",
-    "@shapeshiftoss/hdwallet-walletconnect": "1.62.10",
-    "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.10",
+    "@shapeshiftoss/hdwallet-coinbase": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-core": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-gridplus": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-keepkey": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-keplr": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-ledger": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-native": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-native-vault": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-phantom": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-trezor": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-vultisig": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-walletconnect": "1.62.13-gridplus-validation.16",
+    "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.13-gridplus-validation.16",
     "@shapeshiftoss/swapper": "workspace:^",
     "@shapeshiftoss/types": "workspace:^",
     "@shapeshiftoss/unchained-client": "workspace:^",

packages/chain-adapters/src/error/ErrorHandler.ts

@@ -32,6 +32,24 @@ export const ErrorHandler = async (err: unknown, metadata?: ErrorMetadata): Prom
     })
   }
 
+  if (
+    err instanceof Error &&
+    err.message.includes('Remove inserted SafeCard to access internal GridPlus wallet')
+  ) {
+    throw new ChainAdapterError(err, {
+      translation: 'chainAdapters.errors.gridplus.removeSafeCard',
+    })
+  }
+
+  if (
+    err instanceof Error &&
+    err.message.includes("Active SafeCard doesn't match expected SafeCard")
+  ) {
+    throw new ChainAdapterError(err, {
+      translation: 'chainAdapters.errors.gridplus.wrongSafeCard',
+    })
+  }
+
   if ((err as AxiosError).isAxiosError) {
     const response = JSON.stringify((err as AxiosError).response?.data)
     if (metadata) throw new ChainAdapterError(response, metadata)

src/assets/translations/en/main.json

@@ -1463,6 +1463,9 @@
         "deviceNotConnected": "Device not connected. Call connectDevice first.",
         "connectFailure": "Unable to connect GridPlus wallet",
         "unknown": "An unexpected error occurred communicating with GridPlus wallet"
+      },
+      "menu": {
+        "switchSafeCard": "Switch SafeCard"
       }
     },
     "ledger": {
@@ -2518,7 +2521,11 @@
       "getFeeData": "Failed to estimate network fees.",
       "getPublicKey": "Failed to get public key from wallet.",
       "getUtxos": "Failed to get utxos.",
-      "getValidator": "Failed to get validator."
+      "getValidator": "Failed to get validator.",
+      "gridplus": {
+        "wrongSafeCard": "Wrong SafeCard inserted. Please insert the correct SafeCard and try again.",
+        "removeSafeCard": "Remove inserted SafeCard to access internal GridPlus wallet."
+      }
     }
   },
   "actionCenter": {

src/context/WalletProvider/GridPlus/components/GridPlusMenu.tsx

@@ -0,0 +1,38 @@
+import { RepeatIcon } from '@chakra-ui/icons'
+import { MenuItem } from '@chakra-ui/react'
+import { useCallback } from 'react'
+import { useTranslate } from 'react-polyglot'
+
+import { ManageAccountsMenuItem } from '@/components/Layout/Header/NavBar/ManageAccountsMenuItem'
+import { WalletActions } from '@/context/WalletProvider/actions'
+import { useWallet } from '@/hooks/useWallet/useWallet'
+
+const switchIcon = <RepeatIcon />
+
+type GridPlusMenuProps = {
+  onClose?: () => void
+}
+
+export const GridPlusMenu = ({ onClose }: GridPlusMenuProps) => {
+  const translate = useTranslate()
+  const { dispatch } = useWallet()
+
+  const handleSwitchSafeCard = useCallback(() => {
+    dispatch({ type: WalletActions.RESET_STATE })
+    dispatch({
+      type: WalletActions.SET_INITIAL_ROUTE,
+      payload: '/gridplus/connect',
+    })
+    dispatch({ type: WalletActions.SET_WALLET_MODAL, payload: true })
+    onClose?.()
+  }, [dispatch, onClose])
+
+  return (
+    <>
+      <MenuItem icon={switchIcon} onClick={handleSwitchSafeCard}>
+        {translate('walletProvider.gridplus.menu.switchSafeCard')}
+      </MenuItem>
+      <ManageAccountsMenuItem onClose={onClose} />
+    </>
+  )
+}

src/context/WalletProvider/GridPlus/components/GridPlusPair.tsx

@@ -51,17 +51,21 @@ export const GridPlusPair = () => {
           throw new Error(translate('walletProvider.gridplus.errors.adapterNotAvailable'))
         }
 
-        const wallet = await pairConnectedDevice({
+        const { wallet, activeWalletId, type } = await pairConnectedDevice({
           adapter,
-          deviceId,
           pairingCode,
-          dispatch: appDispatch,
         })
 
         appDispatch(gridplusSlice.actions.setActiveSafeCard(safeCardUuid))
 
         navigate('/gridplus/setup', {
-          state: { safeCardUuid, wallet, safeCardWalletId: `gridplus:${safeCardUuid}` },
+          state: {
+            safeCardUuid,
+            wallet,
+            safeCardWalletId: `gridplus:${safeCardUuid}`,
+            activeWalletId,
+            type,
+          },
         })
       } catch (err) {
         setError((err as Error).message)

src/context/WalletProvider/GridPlus/components/GridPlusSetup.tsx

@@ -21,6 +21,8 @@ type LocationState = {
   defaultName?: string
   needsPairing?: boolean
   deviceId?: string
+  activeWalletId?: string
+  type?: 'external' | 'internal'
 }
 
 export const GridPlusSetup = () => {
@@ -32,7 +34,6 @@ export const GridPlusSetup = () => {
   const appDispatch = useAppDispatch()
 
   const physicalDeviceId = useAppSelector(gridplusSlice.selectors.selectPhysicalDeviceId)
-  const sessionId = useAppSelector(gridplusSlice.selectors.selectSessionId)
 
   const state = location.state as LocationState | undefined
   const safeCardUuid = state?.safeCardUuid
@@ -65,6 +66,9 @@ export const GridPlusSetup = () => {
 
       try {
         let finalWallet = wallet
+        // Use activeWalletId and type from state if available (from pairing flow)
+        let activeWalletId: string | undefined = state?.activeWalletId
+        let type: 'external' | 'internal' | undefined = state?.type
 
         if (!finalWallet) {
           const adapter = await getAdapter(KeyManager.GridPlus)
@@ -77,12 +81,13 @@ export const GridPlusSetup = () => {
             if (!deviceId) {
               throw new Error(translate('walletProvider.gridplus.errors.deviceIdRequired'))
             }
-            finalWallet = await pairConnectedDevice({
+            const result = await pairConnectedDevice({
               adapter,
-              deviceId,
               pairingCode,
-              dispatch: appDispatch,
             })
+            finalWallet = result.wallet
+            activeWalletId = result.activeWalletId
+            type = result.type
           } else {
             const connectionDeviceId = physicalDeviceId || deviceId || state?.deviceId
             if (!connectionDeviceId) {
@@ -92,7 +97,6 @@ export const GridPlusSetup = () => {
             const result = await connectAndPairDevice({
               adapter,
               deviceId: connectionDeviceId,
-              sessionId: sessionId ?? undefined,
               dispatch: appDispatch,
             })
             finalWallet = result ?? undefined
@@ -107,13 +111,23 @@ export const GridPlusSetup = () => {
           throw new Error(translate('walletProvider.gridplus.errors.walletNotAvailable'))
         }
 
+        // If we don't have activeWalletId yet (e.g., when adding new SafeCard with existing wallet),
+        // we need to fetch it from the wallet
+        if (activeWalletId === undefined || type === undefined) {
+          const validation = await finalWallet.validateActiveWallet()
+          activeWalletId = validation.activeWalletId
+          type = validation.type
+        }
+
         const safeCardWalletId = state?.safeCardWalletId || `gridplus:${safeCardUuid}`
         const finalSafeCardName = safeCardName.trim() || defaultName
 
         appDispatch(
           gridplusSlice.actions.addSafeCard({
             id: safeCardUuid,
             name: finalSafeCardName,
+            activeWalletId,
+            type,
           }),
         )
 
@@ -163,8 +177,9 @@ export const GridPlusSetup = () => {
       defaultName,
       state?.safeCardWalletId,
       state?.deviceId,
+      state?.activeWalletId,
+      state?.type,
       physicalDeviceId,
-      sessionId,
       translate,
       getAdapter,
       walletDispatch,

src/context/WalletProvider/GridPlus/components/SafeCardRow.tsx

@@ -1,4 +1,14 @@
-import { Box, Button, ButtonGroup, HStack, IconButton, Input, Text, VStack } from '@chakra-ui/react'
+import {
+  Box,
+  Button,
+  ButtonGroup,
+  HStack,
+  IconButton,
+  Input,
+  Tag,
+  Text,
+  VStack,
+} from '@chakra-ui/react'
 import { memo } from 'react'
 import { FaWallet } from 'react-icons/fa'
 import { IoMdCreate, IoMdTrash } from 'react-icons/io'
@@ -68,7 +78,14 @@ export const SafeCardRow = memo(
             />
           ) : (
             <VStack align='start' flex={1} spacing={0}>
-              <Text fontWeight='medium'>{safeCard.name}</Text>
+              <HStack spacing={2}>
+                <Text fontWeight='medium'>{safeCard.name}</Text>
+                {safeCard.type && (
+                  <Tag size='sm' colorScheme='blue' variant='subtle'>
+                    {safeCard.type === 'internal' ? 'Internal SafeCard' : 'SafeCard'}
+                  </Tag>
+                )}
+              </HStack>
               {safeCard.lastConnectedAt && (
                 <Text fontSize='xs' color='text.subtle'>
                   {translate('walletProvider.gridplus.list.lastConnected', {