refactor: remove wallet capabilities fallback

Author: kernelwhisperer

libs/wallet/package.json

@@ -41,7 +41,6 @@
     "@cowprotocol/iframe-transport": "workspace:*",
     "@cowprotocol/types": "workspace:*",
     "@cowprotocol/ui": "workspace:*",
-    "@cowprotocol/wallet-provider": "workspace:*",
     "@ethereumjs/util": "10.1.0",
     "@metamask/jazzicon": "2.0.0",
     "@metamask/sdk": "0.31.4",

libs/wallet/src/api/state/walletCapabilitiesAtom.test.ts

@@ -1,6 +1,5 @@
 import { createStore, type WritableAtom } from 'jotai'
 
-import type { EIP1193Provider, PublicClient } from 'viem'
 import type { Connector } from 'wagmi'
 
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
@@ -9,7 +8,6 @@ import {
   isAtomicBatchSupportedAtom,
   isAtomicBatchSupportedAsyncAtom,
   isAtomicBatchSupportedLoadableAtom,
-  resolveCapabilitiesForChain,
   walletCapabilitiesAtom,
 } from './walletCapabilitiesAtom'
 
@@ -37,79 +35,34 @@ const MOCK_CHAIN_ID = SupportedChainId.MAINNET
 const MOCK_CONNECTOR = { type: 'injected' } as Connector
 
 const mockGetCapabilities = jest.fn()
-const mockWagmiConfigGetClient = jest.fn()
 
-jest.mock('viem/actions', () => ({
+jest.mock('wagmi/actions', () => ({
   getCapabilities: (...args: unknown[]) => mockGetCapabilities(...args),
 }))
 
 jest.mock('../../wagmi/config', () => ({
-  wagmiConfig: {
-    getClient: (...args: unknown[]) => mockWagmiConfigGetClient(...args),
-  },
+  wagmiConfig: {},
 }))
 
-function createMockEip1193Provider(request = jest.fn()): EIP1193Provider {
-  return {
-    request,
-    on: jest.fn(),
-    removeListener: jest.fn(),
-  } as unknown as EIP1193Provider
-}
-
 function setWalletInfo(
   store: ReturnType<typeof createStore>,
   overrides: Partial<{
     account: string
     chainId: SupportedChainId
     connector: Connector
-    provider: NonNullable<WalletInfo['provider']>
   }> = {},
 ): void {
   store.set(walletInfoAtom, {
     chainId: overrides.chainId ?? MOCK_CHAIN_ID,
     account: overrides.account ?? MOCK_ACCOUNT,
     connector: overrides.connector ?? MOCK_CONNECTOR,
-    provider: overrides.provider ?? createMockEip1193Provider(),
   })
 }
 
-describe('resolveCapabilitiesForChain', () => {
-  const capabilities: WalletCapabilities = { atomic: { status: 'supported' } }
-
-  it('matches numeric chain id key', () => {
-    expect(resolveCapabilitiesForChain({ [MOCK_CHAIN_ID]: capabilities }, MOCK_CHAIN_ID)).toEqual(capabilities)
-  })
-
-  it('matches hex chain id key', () => {
-    expect(resolveCapabilitiesForChain({ '0x1': capabilities }, MOCK_CHAIN_ID)).toEqual(capabilities)
-  })
-
-  it('returns null when no chain key matches', () => {
-    expect(resolveCapabilitiesForChain({ '0x64': capabilities }, MOCK_CHAIN_ID)).toBeNull()
-  })
-
-  it('returns null for empty capabilities', () => {
-    expect(resolveCapabilitiesForChain({}, MOCK_CHAIN_ID)).toBeNull()
-  })
-})
-
 describe('walletCapabilitiesAtom', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     mockGetCapabilities.mockResolvedValue({})
-    mockWagmiConfigGetClient.mockReturnValue({ chainId: MOCK_CHAIN_ID })
-  })
-
-  it('returns null when isSafeViaWc is still loading', async () => {
-    const store = createStore()
-    store.set(writableIsSafeViaWcAtom, null)
-    setWalletInfo(store)
-
-    const result = await store.get(walletCapabilitiesAtom)
-
-    expect(result).toBeNull()
-    expect(mockGetCapabilities).not.toHaveBeenCalled()
   })
 
   describe('walletInfoAtom state: missing required fields', () => {
@@ -118,7 +71,6 @@ describe('walletCapabilitiesAtom', () => {
       store.set(walletInfoAtom, {
         chainId: MOCK_CHAIN_ID,
         connector: MOCK_CONNECTOR,
-        provider: createMockEip1193Provider(),
       })
 
       const result = await store.get(walletCapabilitiesAtom)
@@ -132,7 +84,6 @@ describe('walletCapabilitiesAtom', () => {
       store.set(walletInfoAtom, {
         account: MOCK_ACCOUNT,
         connector: MOCK_CONNECTOR,
-        provider: createMockEip1193Provider(),
       } as WalletInfo)
 
       const result = await store.get(walletCapabilitiesAtom)
@@ -146,21 +97,6 @@ describe('walletCapabilitiesAtom', () => {
       store.set(walletInfoAtom, {
         chainId: MOCK_CHAIN_ID,
         account: MOCK_ACCOUNT,
-        provider: createMockEip1193Provider(),
-      })
-
-      const result = await store.get(walletCapabilitiesAtom)
-
-      expect(result).toBeNull()
-      expect(mockGetCapabilities).not.toHaveBeenCalled()
-    })
-
-    it('returns null when provider is missing', async () => {
-      const store = createStore()
-      store.set(walletInfoAtom, {
-        chainId: MOCK_CHAIN_ID,
-        account: MOCK_ACCOUNT,
-        connector: MOCK_CONNECTOR,
       })
 
       const result = await store.get(walletCapabilitiesAtom)
@@ -170,7 +106,7 @@ describe('walletCapabilitiesAtom', () => {
     })
   })
 
-  describe('getCapabilities (viem)', () => {
+  describe('getCapabilities (wagmi)', () => {
     it('returns capabilities when getCapabilities resolves for the current chain', async () => {
       const capabilities: WalletCapabilities = { atomic: { status: 'supported' } }
       mockGetCapabilities.mockResolvedValue(capabilities)
@@ -181,8 +117,14 @@ describe('walletCapabilitiesAtom', () => {
       const result = await store.get(walletCapabilitiesAtom)
 
       expect(result).toEqual(capabilities)
-      expect(mockGetCapabilities).toHaveBeenCalled()
-      expect(mockWagmiConfigGetClient).toHaveBeenCalledWith({ chainId: MOCK_CHAIN_ID })
+      expect(mockGetCapabilities).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          account: MOCK_ACCOUNT,
+          chainId: MOCK_CHAIN_ID,
+          connector: MOCK_CONNECTOR,
+        }),
+      )
     })
 
     it('returns empty capabilities object when getCapabilities resolves with no fields', async () => {
@@ -196,111 +138,23 @@ describe('walletCapabilitiesAtom', () => {
       expect(result).toEqual({})
     })
 
-    it('returns null when getCapabilities and wallet_getCapabilities both fail', async () => {
-      mockGetCapabilities.mockRejectedValue(new Error('viem error'))
-      const mockRequest = jest.fn().mockRejectedValue(new Error('legacy error'))
-
-      const store = createStore()
-      setWalletInfo(store, { provider: createMockEip1193Provider(mockRequest) })
-
-      const result = await store.get(walletCapabilitiesAtom)
-
-      expect(result).toBeNull()
-      expect(mockRequest).toHaveBeenCalledWith({
-        method: 'wallet_getCapabilities',
-        params: [MOCK_ACCOUNT],
-      })
-    })
-
-    it('returns null when getCapabilities fails and provider does not support EIP-1193 requests', async () => {
-      const error = new Error('viem error')
-      mockGetCapabilities.mockRejectedValue(error)
+    it('returns null when getCapabilities fails', async () => {
+      mockGetCapabilities.mockRejectedValue(new Error('wagmi error'))
 
       const store = createStore()
-      setWalletInfo(store, { provider: {} as PublicClient })
-
-      const result = await store.get(walletCapabilitiesAtom)
-
-      expect(result).toBeNull()
-    })
-
-    it('returns null when getCapabilities times out and provider does not support EIP-1193 requests', async () => {
-      jest.useFakeTimers()
-      mockGetCapabilities.mockImplementation(() => new Promise(() => undefined))
-
-      const store = createStore()
-      setWalletInfo(store, { provider: {} as PublicClient })
-
-      try {
-        const resultPromise = store.get(walletCapabilitiesAtom)
-        await jest.advanceTimersByTimeAsync(5_000)
-        const result = await resultPromise
-
-        expect(result).toBeNull()
-      } finally {
-        jest.useRealTimers()
-      }
-    })
-  })
-
-  describe('wallet_getCapabilities legacy fallback', () => {
-    it('returns capabilities resolved from hex chain id key when viem throws', async () => {
-      const capabilities: WalletCapabilities = { atomic: { status: 'supported' } }
-      mockGetCapabilities.mockRejectedValue(new Error('viem error'))
-      const mockRequest = jest.fn().mockResolvedValue({ '0x1': capabilities })
-
-      const store = createStore()
-      setWalletInfo(store, { provider: createMockEip1193Provider(mockRequest) })
-
-      const result = await store.get(walletCapabilitiesAtom)
-
-      expect(result).toEqual(capabilities)
-    })
-
-    it('returns null when the current chain capability is missing', async () => {
-      const capabilities: WalletCapabilities = { atomic: { status: 'supported' } }
-      mockGetCapabilities.mockRejectedValue(new Error('viem error'))
-      const mockRequest = jest.fn().mockResolvedValue({ '0x64': capabilities })
-
-      const store = createStore()
-      setWalletInfo(store, { provider: createMockEip1193Provider(mockRequest) })
+      setWalletInfo(store)
 
       const result = await store.get(walletCapabilitiesAtom)
 
       expect(result).toBeNull()
     })
 
-    it('uses legacy fallback when getCapabilities times out', async () => {
+    it('returns null when getCapabilities times out', async () => {
       jest.useFakeTimers()
-      const capabilities: WalletCapabilities = { atomic: { status: 'supported' } }
       mockGetCapabilities.mockImplementation(() => new Promise(() => undefined))
-      const mockRequest = jest.fn().mockResolvedValue({ '0x1': capabilities })
 
       const store = createStore()
-      setWalletInfo(store, { provider: createMockEip1193Provider(mockRequest) })
-
-      try {
-        const resultPromise = store.get(walletCapabilitiesAtom)
-        await jest.advanceTimersByTimeAsync(5_000)
-        const result = await resultPromise
-
-        expect(result).toEqual(capabilities)
-        expect(mockRequest).toHaveBeenCalledWith({
-          method: 'wallet_getCapabilities',
-          params: [MOCK_ACCOUNT],
-        })
-      } finally {
-        jest.useRealTimers()
-      }
-    })
-
-    it('returns null when legacy fallback times out', async () => {
-      jest.useFakeTimers()
-      mockGetCapabilities.mockRejectedValue(new Error('viem error'))
-      const mockRequest = jest.fn().mockImplementation(() => new Promise(() => undefined))
-
-      const store = createStore()
-      setWalletInfo(store, { provider: createMockEip1193Provider(mockRequest) })
+      setWalletInfo(store)
 
       try {
         const resultPromise = store.get(walletCapabilitiesAtom)
@@ -319,7 +173,6 @@ describe('isAtomicBatchSupportedAsyncAtom', () => {
   beforeEach(() => {
     jest.clearAllMocks()
     mockGetCapabilities.mockResolvedValue({})
-    mockWagmiConfigGetClient.mockReturnValue({ chainId: MOCK_CHAIN_ID })
   })
 
   it('returns false when walletInfoAtom yields no capabilities (disconnected)', async () => {
@@ -411,7 +264,6 @@ describe('isAtomicBatchSupportedLoadableAtom and isAtomicBatchSupportedAtom', ()
   beforeEach(() => {
     jest.clearAllMocks()
     mockGetCapabilities.mockResolvedValue({})
-    mockWagmiConfigGetClient.mockReturnValue({ chainId: MOCK_CHAIN_ID })
   })
 
   it('isAtomicBatchSupportedAtom returns null while loading', async () => {
@@ -438,9 +290,7 @@ describe('isAtomicBatchSupportedLoadableAtom and isAtomicBatchSupportedAtom', ()
     store.set(writableIsSafeViaWcAtom, false)
     store.set(writableIsSafeAppAtom, false)
     mockGetCapabilities.mockRejectedValue(new Error('network error'))
-    setWalletInfo(store, {
-      provider: createMockEip1193Provider(jest.fn().mockRejectedValue(new Error('legacy error'))),
-    })
+    setWalletInfo(store)
 
     store.get(isAtomicBatchSupportedLoadableAtom)
     const asyncResult = await store.get(isAtomicBatchSupportedAsyncAtom)