Catch errors

Author: FrederikBolding

packages/snaps-simulation/package.json

@@ -61,6 +61,7 @@
     "@metamask/messenger": "^0.3.0",
     "@metamask/permission-controller": "^12.1.1",
     "@metamask/phishing-controller": "^16.1.0",
+    "@metamask/rpc-errors": "^7.0.3",
     "@metamask/snaps-controllers": "workspace:^",
     "@metamask/snaps-execution-environments": "workspace:^",
     "@metamask/snaps-rpc-methods": "workspace:^",

packages/snaps-simulation/src/middleware/provider.ts

@@ -1,10 +1,12 @@
 import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
 import { createAsyncMiddleware } from '@metamask/json-rpc-engine';
+import { rpcErrors } from '@metamask/rpc-errors';
 import type { Json, JsonRpcParams } from '@metamask/utils';
-import { hexToBigInt } from '@metamask/utils';
+import { hasProperty, hexToBigInt } from '@metamask/utils';
 import { InfuraProvider } from 'ethers';
 
-import type { Store, getChainId } from '../store';
+import type { Store } from '../store';
+import { getChainId } from '../store';
 
 /**
  * Create a middleware that uses a JSON-RPC provider to respond to RPC requests.
@@ -16,10 +18,22 @@ export function createProviderMiddleware(
   store: Store,
 ): JsonRpcMiddleware<JsonRpcParams, Json> {
   return createAsyncMiddleware(async (request, response) => {
-    const chainId = getChainId(store.getState());
-    const provider = new InfuraProvider(hexToBigInt(chainId));
+    try {
+      const chainId = getChainId(store.getState());
+      const provider = new InfuraProvider(hexToBigInt(chainId));
 
-    const result = await provider.send(request.method, request.params ?? []);
-    response.result = result;
+      const result = await provider.send(request.method, request.params ?? []);
+      response.result = result;
+    } catch (error) {
+      if (hasProperty(error, 'info') && hasProperty(error.info, 'error')) {
+        response.error = error.info.error;
+        return;
+      }
+      if (hasProperty(error, 'error')) {
+        response.error = error.error;
+        return;
+      }
+      response.error = rpcErrors.internal();
+    }
   });
 }

yarn.lock

@@ -4476,6 +4476,7 @@ __metadata:
     "@metamask/messenger": "npm:^0.3.0"
     "@metamask/permission-controller": "npm:^12.1.1"
     "@metamask/phishing-controller": "npm:^16.1.0"
+    "@metamask/rpc-errors": "npm:^7.0.3"
     "@metamask/snaps-controllers": "workspace:^"
     "@metamask/snaps-execution-environments": "workspace:^"
     "@metamask/snaps-rpc-methods": "workspace:^"