Simplify origin handling

MetaMask · Nov 15, 2024 · 89fa924 · 89fa924
1 parent 503050a
commit 89fa924
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/packages/snaps-controllers/src/multichain/MultichainRoutingController.ts b/packages/snaps-controllers/src/multichain/MultichainRoutingController.ts
@@ -274,13 +274,10 @@ export class MultichainRoutingController extends BaseController<
     if (protocolSnap) {
       return this.messagingSystem.call('SnapController:handleRequest', {
         snapId: protocolSnap.snapId,
-        origin: 'metamask',
+        origin,
         request: {
           method: '',
           params: {
-            // We are overriding the origin here, so that the Snap gets the proper origin
-            // while the permissions check is skipped due to the requesting origin being metamask.
-            origin,
             request,
             scope,
           },

diff --git a/packages/snaps-execution-environments/src/common/commands.ts b/packages/snaps-execution-environments/src/common/commands.ts
@@ -79,13 +79,8 @@ export function getHandlerArguments(
     case HandlerType.OnProtocolRequest: {
       assertIsOnProtocolRequestArguments(request.params);
 
-      // For this specific handler we extract the origin from the parameters.
-      const {
-        origin: nestedOrigin,
-        request: nestedRequest,
-        scope,
-      } = request.params;
-      return { origin: nestedOrigin, request: nestedRequest, scope };
+      const { request: nestedRequest, scope } = request.params;
+      return { request: nestedRequest, scope };
     }
 
     case HandlerType.OnRpcRequest:

diff --git a/packages/snaps-execution-environments/src/common/validation.ts b/packages/snaps-execution-environments/src/common/validation.ts
@@ -245,7 +245,6 @@ export function assertIsOnUserInputRequestArguments(
 }
 
 export const OnProtocolRequestArgumentsStruct = object({
-  origin: string(),
   scope: ChainIdStruct,
   request: JsonRpcRequestStruct,
 });