fix: wallet_addSubAccount keys population if not provided (#1649)

Author: stephancill

examples/testapp/src/pages/add-sub-account/components/AddSubAccountWithoutKeys.tsx

@@ -0,0 +1,73 @@
+import { Box, Button } from '@chakra-ui/react';
+import { createCoinbaseWalletSDK, getCryptoKeyAccount } from '@coinbase/wallet-sdk';
+import { useCallback, useState } from 'react';
+import { numberToHex } from 'viem';
+
+type AddSubAccountWithoutKeysProps = {
+  sdk: ReturnType<typeof createCoinbaseWalletSDK>;
+  onAddSubAccount: (address: string) => void;
+  signerFn: typeof getCryptoKeyAccount;
+};
+
+export function AddSubAccountWithoutKeys({
+  sdk,
+  onAddSubAccount,
+  signerFn,
+}: AddSubAccountWithoutKeysProps) {
+  const [subAccount, setSubAccount] = useState<string>();
+
+  const handleAddSubAccount = useCallback(async () => {
+    if (!sdk) {
+      return;
+    }
+
+    const { account } = await signerFn();
+
+    if (!account) {
+      throw new Error('Could not get owner account');
+    }
+
+    const provider = sdk.getProvider();
+    await provider.request({
+      method: 'wallet_switchEthereumChain',
+      params: [{ chainId: numberToHex(84532) }],
+    });
+
+    const response = (await provider.request({
+      method: 'wallet_addSubAccount',
+      params: [
+        {
+          version: '1',
+          account: {
+            type: 'create',
+          },
+        },
+      ],
+    })) as { address: string };
+
+    console.info('response', response);
+    setSubAccount(response.address);
+    onAddSubAccount(response.address);
+  }, [sdk, onAddSubAccount, signerFn]);
+
+  return (
+    <>
+      <Button w="full" onClick={handleAddSubAccount}>
+        Add Address (Without Keys)
+      </Button>
+      {subAccount && (
+        <Box
+          as="pre"
+          w="full"
+          p={2}
+          bg="gray.900"
+          borderRadius="md"
+          border="1px solid"
+          borderColor="gray.700"
+        >
+          {JSON.stringify(subAccount, null, 2)}
+        </Box>
+      )}
+    </>
+  );
+}

examples/testapp/src/pages/add-sub-account/index.page.tsx

@@ -16,6 +16,7 @@ import { useEIP1193Provider } from '../../context/EIP1193ProviderContextProvider
 import { unsafe_generateOrLoadPrivateKey } from '../../utils/unsafe_generateOrLoadPrivateKey';
 import { AddOwner } from './components/AddOwner';
 import { AddSubAccount } from './components/AddSubAccount';
+import { AddSubAccountWithoutKeys } from './components/AddSubAccountWithoutKeys';
 import { Connect } from './components/Connect';
 import { GenerateNewSigner } from './components/GenerateNewSigner';
 import { GrantSpendPermission } from './components/GrantSpendPermission';
@@ -80,6 +81,11 @@ export default function SubAccounts() {
           onAddSubAccount={setSubAccountAddress}
           signerFn={getSubAccountSigner}
         />
+        <AddSubAccountWithoutKeys
+          sdk={sdk}
+          onAddSubAccount={setSubAccountAddress}
+          signerFn={getSubAccountSigner}
+        />
         <PersonalSign sdk={sdk} subAccountAddress={subAccountAddress} />
         <SendCalls sdk={sdk} subAccountAddress={subAccountAddress} />
         <GrantSpendPermission sdk={sdk} subAccountAddress={subAccountAddress} />

packages/wallet-sdk/src/sign/scw/SCWSigner.test.ts

@@ -865,6 +865,10 @@ describe('SCWSigner', () => {
         },
       });
 
+      // Clear previous mock calls to isolate the wallet_addSubAccount call
+      mockCommunicator.postRequestAndWaitForResponse.mockClear();
+      (encryptContent as Mock).mockClear();
+
       await signer.request({
         method: 'wallet_addSubAccount',
         params: [
@@ -877,6 +881,31 @@ describe('SCWSigner', () => {
         ],
       });
 
+      // Verify that encryptContent was called with a request containing populated keys
+      expect(encryptContent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          action: expect.objectContaining({
+            method: 'wallet_addSubAccount',
+            params: [
+              {
+                version: '1',
+                account: {
+                  type: 'create',
+                  keys: expect.arrayContaining([
+                    expect.objectContaining({
+                      type: expect.any(String),
+                      publicKey: expect.any(String),
+                    }),
+                  ]),
+                },
+              },
+            ],
+          }),
+          chainId: expect.any(Number),
+        }),
+        mockCryptoKey
+      );
+
       const accounts = await signer.request({ method: 'eth_accounts' });
       expect(accounts).toEqual([subAccountAddress, globalAccountAddress]);
     });

packages/wallet-sdk/src/sign/scw/SCWSigner.ts

@@ -496,7 +496,7 @@ export class SCWSigner implements Signer {
       Array.isArray(request.params) &&
       request.params.length > 0 &&
       request.params[0].account &&
-      request.params[0].type === 'create'
+      request.params[0].account.type === 'create'
     ) {
       let keys: { type: string; publicKey: string }[];
       if (request.params[0].account.keys && request.params[0].account.keys.length > 0) {