Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions packages/widget/src/providers/misc/solana-connector.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import type { Wallet } from "@solana/wallet-adapter-react";
import { WalletConnectWalletAdapter } from "@solana/wallet-adapter-wallets";
import { type Connection, Transaction } from "@solana/web3.js";
import {
type Connection,
Transaction,
VersionedTransaction,
} from "@solana/web3.js";
import { MiscNetworks } from "@stakekit/common";
import type {
Chain,
Expand Down Expand Up @@ -38,7 +42,26 @@ const createSolanaConnector = ({
type: solanaWallet.adapter.name,
showQrModal: false,
sendTransaction: async (tx) => {
const solanaTx = Transaction.from(Buffer.from(tx, "hex"));
const base64Decoded = Buffer.from(tx, "base64");
const isBase64 = base64Decoded.toString("base64") === tx;

const buffer = isBase64 ? base64Decoded : Buffer.from(tx, "hex");

let solanaTx: Transaction | VersionedTransaction;
let versionedError: unknown;
try {
solanaTx = VersionedTransaction.deserialize(buffer);
} catch (err) {
versionedError = err;
try {
solanaTx = Transaction.from(buffer);
} catch (legacyErr) {
throw new Error(
`Failed to deserialize Solana transaction. VersionedTransaction error: ${versionedError instanceof Error ? versionedError.message : String(versionedError)}. Legacy Transaction error: ${legacyErr instanceof Error ? legacyErr.message : String(legacyErr)}`
);
}
}

const signed = await solanaWallet.adapter.sendTransaction(
solanaTx,
connection
Expand Down