Fix some minor issues

Author: Mrtenz

packages/examples/packages/browserify-plugin/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "REliam7FRJGwKCI4NaC2G3mBSD5iYR7DCEhrXLcBDqA=",
+    "shasum": "82KbG3cf0wtxooJpWzHeM1g4FhO8O7zSYCAAGNPshfM=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/snaps-rpc-methods/jest.config.js

@@ -10,10 +10,10 @@ module.exports = deepmerge(baseConfig, {
   ],
   coverageThreshold: {
     global: {
-      branches: 92.98,
+      branches: 93.28,
       functions: 97.46,
-      lines: 97.94,
-      statements: 97.53,
+      lines: 98.03,
+      statements: 97.61,
     },
   },
 });

packages/snaps-rpc-methods/src/permitted/getState.test.ts

@@ -279,10 +279,6 @@ describe('get', () => {
     expect(get(object, 'a.b.c')).toBe('value');
   });
 
-  it('returns the object if the key is empty', () => {
-    expect(get(object, '')).toBe(object);
-  });
-
   it('returns `null` if the object is `null`', () => {
     expect(get(null, '')).toBeNull();
   });

packages/snaps-rpc-methods/src/permitted/getState.ts

@@ -153,7 +153,7 @@ export function get(
   value: Record<string, Json> | null,
   key?: string | undefined,
 ): Json {
-  if (key === undefined || key === '') {
+  if (key === undefined) {
     return value;
   }
 

packages/snaps-rpc-methods/src/permitted/setState.test.ts

@@ -285,6 +285,61 @@ describe('snap_setState', () => {
       });
     });
 
+    it('throws if the encrypted parameter is invalid', async () => {
+      const { implementation } = setStateHandler;
+
+      const getSnapState = jest.fn().mockReturnValue({
+        foo: 'bar',
+      });
+
+      const updateSnapState = jest.fn().mockReturnValue(null);
+      const getUnlockPromise = jest.fn().mockResolvedValue(undefined);
+      const hasPermission = jest.fn().mockReturnValue(true);
+
+      const hooks = {
+        getSnapState,
+        updateSnapState,
+        getUnlockPromise,
+        hasPermission,
+      };
+
+      const engine = new JsonRpcEngine();
+
+      engine.push((request, response, next, end) => {
+        const result = implementation(
+          request as JsonRpcRequest<SetStateParameters>,
+          response as PendingJsonRpcResponse<SetStateResult>,
+          next,
+          end,
+          hooks,
+        );
+
+        result?.catch(end);
+      });
+
+      const response = await engine.handle({
+        jsonrpc: '2.0',
+        id: 1,
+        method: 'snap_setState',
+        params: {
+          key: 'foo',
+          value: 'bar',
+          encrypted: 'baz',
+        },
+      });
+
+      expect(response).toStrictEqual({
+        jsonrpc: '2.0',
+        id: 1,
+        error: {
+          code: errorCodes.rpc.invalidParams,
+          message:
+            'Invalid params: At path: encrypted -- Expected a value of type `boolean`, but received: `"baz"`.',
+          stack: expect.any(String),
+        },
+      });
+    });
+
     it('throws if `key` is not provided and `value` is not an object', async () => {
       const { implementation } = setStateHandler;
 

packages/snaps-rpc-methods/src/permitted/setState.ts

@@ -137,7 +137,7 @@ async function setStateImplementation(
       await getUnlockPromise(true);
     }
 
-    const newState = await getNewState(key, value, getSnapState);
+    const newState = await getNewState(key, value, encrypted, getSnapState);
     await updateSnapState(newState, encrypted);
     response.result = null;
   } catch (error) {
@@ -180,20 +180,22 @@ function getValidatedParams(params?: unknown) {
  *
  * @param key - The key to set.
  * @param value - The value to set the key to.
+ * @param encrypted - Whether the state is encrypted.
  * @param getSnapState - The `getSnapState` hook.
  * @returns The new state of the Snap.
  */
 async function getNewState(
   key: string | undefined,
   value: Json,
+  encrypted: boolean,
   getSnapState: SetStateHooks['getSnapState'],
 ) {
   if (key === undefined) {
     assert(isObject(value));
     return value;
   }
 
-  const state = await getSnapState(false);
+  const state = await getSnapState(encrypted);
   return set(state, key, value);
 }