fix: onProtocolRequest validation (#403)

Author: aganglada

.github/workflows/crowdin.yml

@@ -20,7 +20,7 @@ jobs:
       - name: crowdin action
         uses: crowdin/github-action@a3160b9e5a9e00739392c23da5e580c6cabe526d
         with:
-          upload_translations: true
+          upload_translations: false
           download_translations: true
           github_user_name: metamaskbot
           github_user_email: metamaskbot@users.noreply.github.com

packages/snap/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snap-solana-wallet.git"
   },
   "source": {
-    "shasum": "oJE5lrZCkjIwzvMUHqYC1QpSvIxJpZ5EnJf+bhPeSRg=",
+    "shasum": "eBi0+K2mctngR9lOseF7P8ZD0pdRIPxqVn/7uERyND8=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/snap/src/core/handlers/onProtocolRequest/structs.ts

@@ -6,8 +6,7 @@ import {
   tuple,
   number,
 } from '@metamask/superstruct';
-
-import { UuidStruct } from '../../validation/structs';
+import { JsonRpcIdStruct, JsonRpcVersionStruct } from '@metamask/utils';
 
 export enum SolanaProtocolRequestMethod {
   GetGenesisHash = 'getGenesisHash',
@@ -16,21 +15,21 @@ export enum SolanaProtocolRequestMethod {
 }
 
 export const SolanaGetGenesisHashRequestStruct = object({
-  jsonrpc: literal('2.0'),
-  id: UuidStruct,
+  jsonrpc: JsonRpcVersionStruct,
+  id: JsonRpcIdStruct,
   method: literal(SolanaProtocolRequestMethod.GetGenesisHash),
   params: optional(array()),
 });
 
 export const SolanaGetLatestBlockhashRequestStruct = object({
-  jsonrpc: literal('2.0'),
-  id: UuidStruct,
+  jsonrpc: JsonRpcVersionStruct,
+  id: JsonRpcIdStruct,
   method: literal(SolanaProtocolRequestMethod.GetLatestBlockhash),
 });
 
 export const SolanaGetMinimumBalanceForRentExemptionRequestStruct = object({
-  jsonrpc: literal('2.0'),
-  id: UuidStruct,
+  jsonrpc: JsonRpcVersionStruct,
+  id: JsonRpcIdStruct,
   method: literal(
     SolanaProtocolRequestMethod.GetMinimumBalanceForRentExemption,
   ),