stash

app/scripts/lib/accounts/BalancesController.ts

@@ -224,9 +224,10 @@ export class BalancesController extends BaseController<
    * @param accountId - The account ID.
    */
   #getAccount(accountId: string): InternalAccount {
-    const account: InternalAccount = this.#listMultichainAccounts().find(
-      (multichainAccount) => multichainAccount.id === accountId,
-    );
+    const account: InternalAccount | undefined =
+      this.#listMultichainAccounts().find(
+        (multichainAccount) => multichainAccount.id === accountId,
+      );
 
     if (!account) {
       throw new Error(`Unknown account: ${accountId}`);
@@ -247,13 +248,15 @@ export class BalancesController extends BaseController<
     const account = this.#getAccount(accountId);
     const partialState: BalancesControllerState = { balances: {} };
 
-    partialState.balances[account.id] = await this.#getBalances(
-      account.id,
-      account.metadata.snap.id,
-      isBtcMainnetAddress(account.address)
-        ? BTC_MAINNET_ASSETS
-        : BTC_TESTNET_ASSETS,
-    );
+    if (account.metadata.snap) {
+      partialState.balances[account.id] = await this.#getBalances(
+        account.id,
+        account.metadata.snap.id,
+        isBtcMainnetAddress(account.address)
+          ? BTC_MAINNET_ASSETS
+          : BTC_TESTNET_ASSETS,
+      );
+    }
 
     this.update((state: Draft<BalancesControllerState>) => ({
       ...state,
@@ -292,7 +295,7 @@ export class BalancesController extends BaseController<
     return (
       !isEvmAccountType(account.type) &&
       // Non-EVM accounts are backed by a Snap for now
-      account.metadata.snap
+      account.metadata.snap !== undefined
     );
   }
 

app/scripts/lib/createDupeReqFilterStream.test.ts

@@ -3,7 +3,7 @@ import OurReadableStream from 'readable-stream';
 import ReadableStream2 from 'readable-stream-2';
 import ReadableStream3 from 'readable-stream-3';
 
-import type { JsonRpcRequest } from '@metamask/utils';
+import { JsonRpcNotification, type JsonRpcRequest } from '@metamask/utils';
 import createDupeReqFilterStream, {
   THREE_MINUTES,
 } from './createDupeReqFilterStream';
@@ -26,7 +26,7 @@ function createTestStream(output: JsonRpcRequest[] = [], S = Transform) {
 }
 
 function runStreamTest(
-  requests: JsonRpcRequest[] = [],
+  requests: (JsonRpcRequest | JsonRpcNotification)[] = [],
   advanceTimersTime = 10,
   S = Transform,
 ) {
@@ -52,13 +52,13 @@ describe('createDupeReqFilterStream', () => {
 
   it('lets through requests with ids being seen for the first time', async () => {
     const requests = [
-      { id: 1, method: 'foo' },
-      { id: 2, method: 'bar' },
+      { id: 1, method: 'foo', jsonrpc: '2.0' as const },
+      { id: 2, method: 'bar', jsonrpc: '2.0' as const },
     ];
 
     const expectedOutput = [
-      { id: 1, method: 'foo' },
-      { id: 2, method: 'bar' },
+      { id: 1, method: 'foo', jsonrpc: '2.0' },
+      { id: 2, method: 'bar', jsonrpc: '2.0' },
     ];
 
     const output = await runStreamTest(requests);
@@ -67,42 +67,48 @@ describe('createDupeReqFilterStream', () => {
 
   it('does not let through the request if the id has been seen before', async () => {
     const requests = [
-      { id: 1, method: 'foo' },
-      { id: 1, method: 'foo' }, // duplicate
+      { id: 1, method: 'foo', jsonrpc: '2.0' as const },
+      { id: 1, method: 'foo', jsonrpc: '2.0' as const }, // duplicate
     ];
 
-    const expectedOutput = [{ id: 1, method: 'foo' }];
+    const expectedOutput = [{ id: 1, method: 'foo', jsonrpc: '2.0' }];
 
     const output = await runStreamTest(requests);
     expect(output).toEqual(expectedOutput);
   });
 
   it("lets through requests if they don't have an id", async () => {
-    const requests = [{ method: 'notify1' }, { method: 'notify2' }];
+    const requests = [
+      { method: 'notify1', jsonrpc: '2.0' as const },
+      { method: 'notify2', jsonrpc: '2.0' as const },
+    ];
 
-    const expectedOutput = [{ method: 'notify1' }, { method: 'notify2' }];
+    const expectedOutput = [
+      { method: 'notify1', jsonrpc: '2.0' },
+      { method: 'notify2', jsonrpc: '2.0' },
+    ];
 
     const output = await runStreamTest(requests);
     expect(output).toEqual(expectedOutput);
   });
 
   it('handles a mix of request types', async () => {
     const requests = [
-      { id: 1, method: 'foo' },
-      { method: 'notify1' },
-      { id: 1, method: 'foo' },
-      { id: 2, method: 'bar' },
-      { method: 'notify2' },
-      { id: 2, method: 'bar' },
-      { id: 3, method: 'baz' },
+      { id: 1, method: 'foo', jsonrpc: '2.0' as const },
+      { method: 'notify1', jsonrpc: '2.0' as const },
+      { id: 1, method: 'foo', jsonrpc: '2.0' as const },
+      { id: 2, method: 'bar', jsonrpc: '2.0' as const },
+      { method: 'notify2', jsonrpc: '2.0' as const },
+      { id: 2, method: 'bar', jsonrpc: '2.0' as const },
+      { id: 3, method: 'baz', jsonrpc: '2.0' as const },
     ];
 
     const expectedOutput = [
-      { id: 1, method: 'foo' },
-      { method: 'notify1' },
-      { id: 2, method: 'bar' },
-      { method: 'notify2' },
-      { id: 3, method: 'baz' },
+      { id: 1, method: 'foo', jsonrpc: '2.0' },
+      { method: 'notify1', jsonrpc: '2.0' },
+      { id: 2, method: 'bar', jsonrpc: '2.0' },
+      { method: 'notify2', jsonrpc: '2.0' },
+      { id: 3, method: 'baz', jsonrpc: '2.0' },
     ];
 
     const output = await runStreamTest(requests);

app/scripts/lib/createDupeReqFilterStream.ts

@@ -54,7 +54,8 @@ export default function createDupeReqFilterStream() {
     transform(chunk: JsonRpcRequest, _, cb) {
       // JSON-RPC notifications have no ids; our only recourse is to let them through.
       const hasNoId = chunk.id === undefined;
-      const requestNotYetSeen = seenRequestIds.add(chunk.id);
+      const requestNotYetSeen =
+        chunk.id !== null && seenRequestIds.add(chunk.id);
 
       if (hasNoId || requestNotYetSeen) {
         cb(null, chunk);

app/scripts/lib/ppom/ppom-middleware.ts

@@ -61,7 +61,9 @@ export function createPPOMMiddleware<
   ) => void,
 ) {
   return async (
-    req: JsonRpcRequest<Params>,
+    req: JsonRpcRequest<Params> & {
+      securityAlertResponse: SecurityAlertResponse;
+    },
     _res: JsonRpcResponse<Result>,
     next: () => void,
   ) => {
@@ -80,13 +82,15 @@ export function createPPOMMiddleware<
         return;
       }
 
-      const { isSIWEMessage } = detectSIWE({ data: req?.params?.[0] });
+      const data =
+        (Array.isArray(req.params) ? req.params[0] : req.params) ?? {};
+      const { isSIWEMessage } = detectSIWE({ data });
       if (isSIWEMessage) {
         return;
       }
 
       if (req.method === MESSAGE_TYPE.ETH_SEND_TRANSACTION) {
-        const { to: toAddress } = req?.params?.[0] ?? {};
+        const { to: toAddress } = data;
         const internalAccounts = accountsController.listAccounts();
         const isToInternalAccount = internalAccounts.some(
           ({ address }) => address?.toLowerCase() === toAddress?.toLowerCase(),

app/scripts/lib/ppom/ppom-util.ts

@@ -32,6 +32,11 @@ const SECURITY_ALERT_RESPONSE_ERROR = {
   reason: BlockaidReason.errored,
 };
 
+type PPOMRequest = Exclude<JsonRpcRequest, 'method' | 'params'> & {
+  method: typeof METHOD_SEND_TRANSACTION;
+  params: [TransactionParams];
+};
+
 export async function validateRequestWithPPOM({
   ppomController,
   request,
@@ -129,12 +134,14 @@ export async function isChainSupported(chainId: Hex): Promise<boolean> {
   return supportedChainIds.includes(chainId);
 }
 
-function normalizePPOMRequest(request: JsonRpcRequest): JsonRpcRequest {
+function normalizePPOMRequest(
+  request: JsonRpcRequest,
+): PPOMRequest | typeof request {
   if (request.method !== METHOD_SEND_TRANSACTION) {
     return request;
   }
 
-  const transactionParams = (request.params?.[0] || {}) as TransactionParams;
+  const transactionParams = request.params[0] ?? {};
   const normalizedParams = normalizeTransactionParams(transactionParams);
 
   return {
@@ -210,7 +217,7 @@ async function validateWithController(
 async function validateWithAPI(
   ppomController: PPOMController,
   chainId: string,
-  request: JsonRpcRequest,
+  request: PPOMRequest,
 ): Promise<SecurityAlertResponse> {
   try {
     const response = await validateWithSecurityAlertsAPI(chainId, request);

app/scripts/lib/snap-keyring/snap-keyring.test.ts

@@ -50,6 +50,10 @@ const mockInternalAccount = {
       name: mockSnapName,
     },
     name: accountNameSuggestion,
+    keyring: {
+      type: '',
+    },
+    importTime: 0,
   },
 };
 

app/scripts/lib/transaction/util.test.ts

@@ -472,7 +472,7 @@ describe('Transaction Utils', () => {
         expect(validateRequestWithPPOMMock).toHaveBeenCalledTimes(0);
       });
 
-      it('send to users own acccount', async () => {
+      it('send to users own account', async () => {
         const sendRequest = {
           ...request,
           transactionParams: {
@@ -484,9 +484,10 @@ describe('Transaction Utils', () => {
           ...sendRequest,
           securityAlertsEnabled: false,
           chainId: '0x1',
-          internalAccounts: {
-            address: INTERNAL_ACCOUNT_ADDRESS,
-          } as InternalAccount,
+          internalAccounts: [
+            // @ts-expect-error Passing incomplete account type for mocking purposes
+            { address: INTERNAL_ACCOUNT_ADDRESS },
+          ],
         });
 
         expect(

app/scripts/lib/transaction/util.ts

@@ -264,11 +264,12 @@ async function validateSecurity(request: AddTransactionRequest) {
       params: [
         {
           from,
-          to,
-          value,
-          data,
+          to: to ?? '',
+          value: value ?? '',
+          data: data ?? '',
         },
       ],
+      jsonrpc: '2.0' as const,
     };
 
     const securityAlertId = generateSecurityAlertId();

app/scripts/migrations/105.test.ts

@@ -72,6 +72,7 @@ function expectedInternalAccount(
         type: 'HD Key Tree',
       },
       lastSelected: lastSelected ? expect.any(Number) : undefined,
+      importTime: Date.now(),
     },
     options: {},
     methods: ETH_EOA_METHODS,

app/scripts/migrations/105.ts

@@ -103,6 +103,7 @@ function createInternalAccountsForAccountsController(
           // initial updateAccounts call.
           type: 'HD Key Tree',
         },
+        importTime: Date.now(),
       },
       methods: ETH_EOA_METHODS,
       type: EthAccountType.Eoa,

app/scripts/migrations/119.ts

@@ -46,13 +46,13 @@ function transformState(state: Record<string, any>) {
         .accounts,
     ).length > 0
   ) {
-    Object.values(accountsController.internalAccounts.accounts).forEach(
-      (internalAccount: InternalAccount) => {
-        if (!internalAccount.metadata?.importTime) {
-          internalAccount.metadata.importTime = Date.now();
-        }
-      },
-    );
+    Object.values<InternalAccount>(
+      accountsController.internalAccounts.accounts,
+    ).forEach((internalAccount) => {
+      if (!internalAccount.metadata?.importTime) {
+        internalAccount.metadata.importTime = Date.now();
+      }
+    });
   }
 
   return {

app/scripts/snaps/preinstalled-snaps.ts

@@ -4,9 +4,10 @@ import MessageSigningSnap from '@metamask/message-signing-snap/dist/preinstalled
 import BitcoinWalletSnap from '@metamask/bitcoin-wallet-snap/dist/preinstalled-snap.json';
 ///: END:ONLY_INCLUDE_IF
 
-const PREINSTALLED_SNAPS: readonly PreinstalledSnap[] = Object.freeze([
+const PREINSTALLED_SNAPS = Object.freeze<PreinstalledSnap[]>([
   MessageSigningSnap as PreinstalledSnap,
   ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+  // @ts-expect-error Type 'string' is not comparable to type '{ [brand]: unique symbol; }'.ts(2352)
   BitcoinWalletSnap as PreinstalledSnap,
   ///: END:ONLY_INCLUDE_IF
 ]);

test/e2e/tests/api-usage/account-tracker-api-usage.spec.ts

@@ -72,7 +72,7 @@ async function getAllInfuraJsonRpcRequests(
     );
 
     for (const r of seenProviderRequests) {
-      const json = await r.body.getJson();
+      const json = (await r.body.getJson()) as JsonRpcRequest | undefined;
       if (json !== undefined) {
         allInfuraJsonRpcRequests.push(json);
       }

ui/contexts/snaps/snap-interface.tsx

@@ -110,9 +110,8 @@ export const SnapInterfaceContextProvider: FunctionComponent<
         params: {
           event: {
             type: event,
-            // TODO: Allow null in the types and simplify this
-            ...(name !== undefined && name !== null ? { name } : {}),
-            ...(value !== undefined && value !== null ? { value } : {}),
+            name,
+            value,
           },
           id: interfaceId,
           context,

ui/hooks/useMultichainSelector.test.ts

@@ -60,6 +60,7 @@ describe('useMultichainSelector', () => {
   });
 
   it('uses selectedAccount if account is not provided', () => {
+    // @ts-expect-error Intentionally passing in invalid input for testing purposes
     const { result } = renderUseMultichainHook(getMultichainIsEvm, null);
 
     expect(result.current).toBe(true);

ui/selectors/accounts.test.ts

@@ -101,7 +101,7 @@ describe('Accounts Selectors', () => {
           ...MOCK_STATE.metamask,
           internalAccounts: {
             selectedAccount: MOCK_ACCOUNT_EOA.id,
-            accounts: [MOCK_ACCOUNT_EOA],
+            accounts: { mock_account_eoa: MOCK_ACCOUNT_EOA },
           },
         },
       };
@@ -118,10 +118,11 @@ describe('Accounts Selectors', () => {
           ...MOCK_STATE.metamask,
           internalAccounts: {
             selectedAccount: MOCK_ACCOUNT_BIP122_P2WPKH.id,
-            accounts: [
-              MOCK_ACCOUNT_BIP122_P2WPKH,
-              MOCK_ACCOUNT_BIP122_P2WPKH_TESTNET,
-            ],
+            accounts: {
+              mock_account_bip122_pwpkh: MOCK_ACCOUNT_BIP122_P2WPKH,
+              mock_account_bip122_p2wpkh_testnet:
+                MOCK_ACCOUNT_BIP122_P2WPKH_TESTNET,
+            },
           },
         },
       };
@@ -136,7 +137,9 @@ describe('Accounts Selectors', () => {
           ...MOCK_STATE.metamask,
           internalAccounts: {
             selectedAccount: MOCK_ACCOUNT_BIP122_P2WPKH.id,
-            accounts: [MOCK_ACCOUNT_BIP122_P2WPKH],
+            accounts: {
+              mock_account_bip122_p2wpkh: MOCK_ACCOUNT_BIP122_P2WPKH,
+            },
           },
         },
       };