cleanup

Author: Lykhoyda

packages/snap/src/index.test.tsx

@@ -9,7 +9,7 @@ let wasmModule: InitOutput;
  *
  * invoked the snap.
  * @param args.request - A validated JSON-RPC request object.
- * @returns The result of `snap_dialog`.
+ * @returns The ViewingKey
  * @throws If the request method is not valid for this snap.
  */
 export const onRpcRequest: ({

packages/snap/src/index.tsx

@@ -10,13 +10,12 @@ export async function getViewingKey() {
 
     // Define the account index and network
     const accountIndex = 0;
-    const network = 'main' as Network;
+    const network = 'test' as Network;
 
     // Generate the UnifiedSpendingKey and obtain the Viewing Key
     const viewingKey = await generateViewingKey(seed, accountIndex, network);
 
     console.log('viewingKey', viewingKey);
-    // Return the Viewing Key to the dApp
     return viewingKey.encode(network);
   } catch (error) {
     console.error('Error generating Viewing Key:', error);

packages/snap/src/rpc/getViewingKey.ts

@@ -1,10 +1,35 @@
-function hexStringToUint8Array(hex: string): Uint8Array {
-    if (hex.length % 2 !== 0) {
-        throw new Error('Invalid hex string: length must be even');
+/**
+ * Converts a hexadecimal string to a Uint8Array.
+ * @param hexString - The hexadecimal string to convert.
+ * @returns A Uint8Array representing the binary data of the hex string.
+ * @throws Will throw an error if the input string contains non-hex characters or has an odd length.
+ */
+function hexStringToUint8Array(hexString: string): Uint8Array {
+  // Remove any leading "0x" or "0X" if present
+  if (hexString.startsWith('0x') || hexString.startsWith('0X')) {
+    hexString = hexString.slice(2);
+  }
+
+  if (!/^[0-9a-fA-F]*$/.test(hexString)) {
+    throw new Error('Hex string contains invalid characters');
+  }
+
+  if (hexString.length % 2 !== 0) {
+    throw new Error('Hex string must have an even length');
+  }
+
+  const byteArray = new Uint8Array(hexString.length / 2);
+
+  for (let i = 0; i < byteArray.length; i++) {
+    const byte = hexString.slice(i * 2, i * 2 + 2);
+    const byteValue = parseInt(byte, 16);
+
+    if (isNaN(byteValue)) {
+      throw new Error(`Invalid hex byte: "${byte}"`);
     }
-    const uint8Array = new Uint8Array(hex.length / 2);
-    for (let i = 0; i < uint8Array.length; i++) {
-        uint8Array[i] = parseInt(hex.substr(i * 2, 2), 16);
-    }
-    return uint8Array;
-}
+
+    byteArray[i] = byteValue;
+  }
+
+  return byteArray;
+}