@phantom/parsers 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { NetworkId } from '@phantom/constants';
 import { Transaction as Transaction$1 } from '@solana/transactions';
-import { Transaction } from '@solana/web3.js';
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
 
 /**
  * Chain-specific transaction and message response parsing
@@ -27,11 +27,9 @@ declare function parseSignMessageResponse(base64Response: string, networkId: Net
 declare function parseTransactionResponse(base64RawTransaction: string, networkId: NetworkId, hash?: string): ParsedTransactionResult;
 /**
  * Parse Solana signed transaction from base64url encoded transaction bytes
+ * Supports both legacy Transaction and VersionedTransaction formats
  */
-declare function parseSolanaSignedTransaction(base64RawTransaction: string): {
-    transaction: Transaction | null;
-    fallback: boolean;
-};
+declare function parseSolanaSignedTransaction(base64RawTransaction: string): Transaction | VersionedTransaction | null;
 
 interface ParsedTransaction {
     base64url: string;

package/dist/index.js

@@ -43,11 +43,11 @@ var import_transactions = require("@solana/transactions");
 var import_buffer2 = require("buffer");
 
 // src/response-parsers.ts
-var import_constants = require("@phantom/constants");
 var import_base64url = require("@phantom/base64url");
-var import_buffer = require("buffer");
-var import_bs58 = __toESM(require("bs58"));
+var import_constants = require("@phantom/constants");
 var import_web3 = require("@solana/web3.js");
+var import_bs58 = __toESM(require("bs58"));
+var import_buffer = require("buffer");
 function parseSignMessageResponse(base64Response, networkId) {
   const networkPrefix = networkId.split(":")[0].toLowerCase();
   switch (networkPrefix) {
@@ -99,6 +99,12 @@ function parseSolanaSignatureResponse(base64Response) {
 function parseEVMSignatureResponse(base64Response) {
   try {
     const signatureBytes = (0, import_base64url.base64urlDecode)(base64Response);
+    if (signatureBytes.length === 65) {
+      const recoveryId = signatureBytes[64];
+      if (recoveryId === 0 || recoveryId === 1) {
+        signatureBytes[64] = recoveryId + 27;
+      }
+    }
     const signature = "0x" + import_buffer.Buffer.from(signatureBytes).toString("hex");
     return {
       signature,
@@ -145,17 +151,19 @@ function parseBitcoinSignatureResponse(base64Response) {
 }
 function parseSolanaSignedTransaction(base64RawTransaction) {
   try {
-    const transactionBytes = import_buffer.Buffer.from(base64RawTransaction, "base64url");
-    const transaction = import_web3.Transaction.from(transactionBytes);
-    return {
-      transaction,
-      fallback: false
-    };
+    const transactionBytes = (0, import_base64url.base64urlDecode)(base64RawTransaction);
+    try {
+      const transaction = import_web3.Transaction.from(transactionBytes);
+      return transaction;
+    } catch (legacyError) {
+      if (legacyError instanceof Error && legacyError.message.includes("Versioned messages")) {
+        const versionedTransaction = import_web3.VersionedTransaction.deserialize(transactionBytes);
+        return versionedTransaction;
+      }
+      throw legacyError;
+    }
   } catch (error) {
-    return {
-      transaction: null,
-      fallback: true
-    };
+    return null;
   }
 }
 

package/dist/index.mjs

@@ -4,11 +4,11 @@ import { getTransactionEncoder } from "@solana/transactions";
 import { Buffer as Buffer2 } from "buffer";
 
 // src/response-parsers.ts
-import { getExplorerUrl } from "@phantom/constants";
 import { base64urlDecode } from "@phantom/base64url";
-import { Buffer } from "buffer";
+import { getExplorerUrl } from "@phantom/constants";
+import { Transaction, VersionedTransaction } from "@solana/web3.js";
 import bs58 from "bs58";
-import { Transaction } from "@solana/web3.js";
+import { Buffer } from "buffer";
 function parseSignMessageResponse(base64Response, networkId) {
   const networkPrefix = networkId.split(":")[0].toLowerCase();
   switch (networkPrefix) {
@@ -60,6 +60,12 @@ function parseSolanaSignatureResponse(base64Response) {
 function parseEVMSignatureResponse(base64Response) {
   try {
     const signatureBytes = base64urlDecode(base64Response);
+    if (signatureBytes.length === 65) {
+      const recoveryId = signatureBytes[64];
+      if (recoveryId === 0 || recoveryId === 1) {
+        signatureBytes[64] = recoveryId + 27;
+      }
+    }
     const signature = "0x" + Buffer.from(signatureBytes).toString("hex");
     return {
       signature,
@@ -106,17 +112,19 @@ function parseBitcoinSignatureResponse(base64Response) {
 }
 function parseSolanaSignedTransaction(base64RawTransaction) {
   try {
-    const transactionBytes = Buffer.from(base64RawTransaction, "base64url");
-    const transaction = Transaction.from(transactionBytes);
-    return {
-      transaction,
-      fallback: false
-    };
+    const transactionBytes = base64urlDecode(base64RawTransaction);
+    try {
+      const transaction = Transaction.from(transactionBytes);
+      return transaction;
+    } catch (legacyError) {
+      if (legacyError instanceof Error && legacyError.message.includes("Versioned messages")) {
+        const versionedTransaction = VersionedTransaction.deserialize(transactionBytes);
+        return versionedTransaction;
+      }
+      throw legacyError;
+    }
   } catch (error) {
-    return {
-      transaction: null,
-      fallback: true
-    };
+    return null;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/parsers",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
   "description": "Transaction and message parsers for Phantom Wallet SDK",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -29,9 +29,9 @@
     "prettier": "prettier --write \"src/**/*.{ts}\""
   },
   "dependencies": {
-    "@phantom/base64url": "^1.0.0-beta.5",
-    "@phantom/constants": "^1.0.0-beta.5",
-    "@phantom/sdk-types": "^1.0.0-beta.5",
+    "@phantom/base64url": "^1.0.0-beta.7",
+    "@phantom/constants": "^1.0.0-beta.7",
+    "@phantom/sdk-types": "^1.0.0-beta.7",
     "@solana/transactions": "^2.0.0",
     "@solana/web3.js": "^1.95.0",
     "bs58": "^6.0.0",