Elliottdenis/defi 105 cant do a sol tx in the dashboard (#60)

* fix sol adapter

* optimize code

* move sha256

Author: Ellzer

apps/solana/src/parser.ts

@@ -329,7 +329,7 @@ export const parseSolTx = (txRaw: string): ParseSolTxResult => {
   if (!isHex(input) && isBase64(input)) {
     try {
       hexInput = base64ToHex(input);
-    } catch (error) {
+    } catch (_error) {
       throw new Error('Failed to decode base64 input');
     }
   }

apps/solana/src/solana-adapter.tsx

@@ -1,42 +1,32 @@
 import { type ProtocolAdapter, SOL } from '@protocols/shared';
+import { Transaction } from '@solana/web3.js';
 import { Summary } from '@/components/Summary';
 import { convertToMessage, looksLikeMessage, type MessageLike, type ParseSolTxResult, parseSolTx } from '@/parser';
 import type { DecodedInstruction } from '@/types';
-import { base64ToHex, isBase64, isHex } from '@/utils';
+import { base64ToHex, isBase64, isHex, sha256 } from '@/utils';
 
 const computeSolanaHash = async (rawTx: string): Promise<string> => {
   try {
     const input = rawTx.trim();
 
     // If input is a JSON message
     if (input.startsWith('{') || input.startsWith('[')) {
-      try {
-        const obj = JSON.parse(input);
-        const msg = (obj.message ?? obj) as MessageLike;
-        if (looksLikeMessage(msg)) {
-          const message = convertToMessage(msg);
-          const messageBytes = message.serialize();
-          const hexString = messageBytes.toString('hex');
-
-          const transactionUint8Array = new Uint8Array(
-            hexString.match(/.{1,2}/g)?.map((byte) => parseInt(byte, 16)) || [],
-          );
-          const hashBuffer = await crypto.subtle.digest('SHA-256', transactionUint8Array);
-          const hashArray = Array.from(new Uint8Array(hashBuffer));
-          return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
-        }
-      } catch {}
+      const obj = JSON.parse(input);
+      const msg = (obj.message ?? obj) as MessageLike;
+      if (looksLikeMessage(msg)) {
+        const message = convertToMessage(msg);
+        return sha256(new Uint8Array(message.serialize()));
+      }
     }
 
+    // Hex or base64 path
     let hexInput = input;
     if (!isHex(input) && isBase64(input)) {
       hexInput = base64ToHex(input);
     }
 
-    const transactionUint8Array = new Uint8Array(hexInput.match(/.{1,2}/g)?.map((byte) => parseInt(byte, 16)) || []);
-    const hashBuffer = await crypto.subtle.digest('SHA-256', transactionUint8Array);
-    const hashArray = Array.from(new Uint8Array(hashBuffer));
-    return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
+    const tx = Transaction.from(Buffer.from(hexInput, 'hex'));
+    return sha256(new Uint8Array(tx.serializeMessage()));
   } catch {
     throw new Error('Failed to compute Solana hash');
   }

apps/solana/src/utils.ts

@@ -19,3 +19,10 @@ export const base64ToHex = (base64: string): string => {
   }
   return hex;
 };
+
+export const sha256 = async (data: Uint8Array): Promise<string> => {
+  const hashBuffer = await crypto.subtle.digest('SHA-256', data as BufferSource);
+  return Array.from(new Uint8Array(hashBuffer))
+    .map((b) => b.toString(16).padStart(2, '0'))
+    .join('');
+};