@vue-solana/core 1.2.0 → 2.0.0

package/dist/shared/{core.DAUuCWrr.d.mts → core.DMgTrB_2.d.cts}

@@ -1,8 +1,5 @@
-/// <reference path="../../types/web3-compat.d.ts" />
-/// <reference path="../../types/buffer.d.ts" />
-import { Commitment, SendOptions, Connection, Transaction, VersionedTransaction, PublicKey, TransactionSignature, RpcResponseAndContext, SignatureResult } from '@solana/web3-compat';
 import * as _solana_kit from '@solana/kit';
-import { Address } from '@solana/kit';
+import { Commitment, Slot, Address, Signature } from '@solana/kit';
 
 /**
  * Create a @solana/kit client for the given Solana configuration.
@@ -30,17 +27,15 @@ interface SolanaContext {
     cluster: SolanaCluster;
     endpoint: string;
     wsEndpoint: string;
-    connection: Connection;
     client: SolanaClient;
 }
-type SolanaTransaction = Transaction | VersionedTransaction;
+type SolanaTransaction = Uint8Array;
 interface SolanaSignMessageResult {
     signedMessage: Uint8Array;
     signature: Uint8Array;
 }
 interface SolanaWallet {
-    publicKey: PublicKey | null;
-    address?: Address;
+    publicKey: Address | null;
     connected: boolean;
     connecting?: boolean;
     disconnecting?: boolean;
@@ -49,10 +44,10 @@ interface SolanaWallet {
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     signMessage?: (message: Uint8Array) => Promise<SolanaSignMessageResult>;
-    signTransaction?: <T extends SolanaTransaction>(transaction: T) => Promise<T>;
-    signAllTransactions?: <T extends SolanaTransaction>(transactions: T[]) => Promise<T[]>;
-    signAndSendTransaction?: (transaction: SolanaTransaction, options?: SendOptions) => Promise<{
-        signature: TransactionSignature;
+    signTransaction?: (transaction: SolanaTransaction) => Promise<SolanaTransaction>;
+    signAllTransactions?: (transactions: SolanaTransaction[]) => Promise<SolanaTransaction[]>;
+    signAndSendTransaction?: (transaction: SolanaTransaction, options?: SendTransactionOptions) => Promise<{
+        signature: string;
     }>;
 }
 interface SolanaWalletInfo {
@@ -81,18 +76,27 @@ interface SolanaWalletInfo {
     }[];
     wallet: unknown;
 }
-interface SendTransactionOptions extends SendOptions {
+interface SendTransactionOptions {
     skipPreflight?: boolean;
+    maxRetries?: bigint;
+    minContextSlot?: Slot;
+    preflightCommitment?: Commitment;
 }
 interface ConfirmTransactionOptions {
     commitment?: Commitment;
     timeoutMs?: number;
 }
+interface TransactionStatus {
+    slot: Slot;
+    confirmations: bigint | null;
+    err: unknown | null;
+    confirmationStatus: Commitment | null;
+}
 interface TransactionConfirmation {
-    signature: TransactionSignature;
+    signature: Signature;
     commitment: Commitment;
-    result: RpcResponseAndContext<SignatureResult>;
+    status: TransactionStatus;
 }
 
-export { createSolanaClient as j };
-export type { ConfirmTransactionOptions as C, SendTransactionOptions as S, TransactionConfirmation as T, SolanaChain as a, SolanaClient as b, SolanaCluster as c, SolanaConfig as d, SolanaContext as e, SolanaSignMessageResult as f, SolanaTransaction as g, SolanaWallet as h, SolanaWalletInfo as i };
+export { createSolanaClient as k };
+export type { ConfirmTransactionOptions as C, SendTransactionOptions as S, TransactionConfirmation as T, SolanaChain as a, SolanaClient as b, SolanaCluster as c, SolanaConfig as d, SolanaContext as e, SolanaSignMessageResult as f, SolanaTransaction as g, SolanaWallet as h, SolanaWalletInfo as i, TransactionStatus as j };

package/dist/shared/{core.DAUuCWrr.d.ts → core.DMgTrB_2.d.mts}

@@ -1,8 +1,5 @@
-/// <reference path="../../types/web3-compat.d.ts" />
-/// <reference path="../../types/buffer.d.ts" />
-import { Commitment, SendOptions, Connection, Transaction, VersionedTransaction, PublicKey, TransactionSignature, RpcResponseAndContext, SignatureResult } from '@solana/web3-compat';
 import * as _solana_kit from '@solana/kit';
-import { Address } from '@solana/kit';
+import { Commitment, Slot, Address, Signature } from '@solana/kit';
 
 /**
  * Create a @solana/kit client for the given Solana configuration.
@@ -30,17 +27,15 @@ interface SolanaContext {
     cluster: SolanaCluster;
     endpoint: string;
     wsEndpoint: string;
-    connection: Connection;
     client: SolanaClient;
 }
-type SolanaTransaction = Transaction | VersionedTransaction;
+type SolanaTransaction = Uint8Array;
 interface SolanaSignMessageResult {
     signedMessage: Uint8Array;
     signature: Uint8Array;
 }
 interface SolanaWallet {
-    publicKey: PublicKey | null;
-    address?: Address;
+    publicKey: Address | null;
     connected: boolean;
     connecting?: boolean;
     disconnecting?: boolean;
@@ -49,10 +44,10 @@ interface SolanaWallet {
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     signMessage?: (message: Uint8Array) => Promise<SolanaSignMessageResult>;
-    signTransaction?: <T extends SolanaTransaction>(transaction: T) => Promise<T>;
-    signAllTransactions?: <T extends SolanaTransaction>(transactions: T[]) => Promise<T[]>;
-    signAndSendTransaction?: (transaction: SolanaTransaction, options?: SendOptions) => Promise<{
-        signature: TransactionSignature;
+    signTransaction?: (transaction: SolanaTransaction) => Promise<SolanaTransaction>;
+    signAllTransactions?: (transactions: SolanaTransaction[]) => Promise<SolanaTransaction[]>;
+    signAndSendTransaction?: (transaction: SolanaTransaction, options?: SendTransactionOptions) => Promise<{
+        signature: string;
     }>;
 }
 interface SolanaWalletInfo {
@@ -81,18 +76,27 @@ interface SolanaWalletInfo {
     }[];
     wallet: unknown;
 }
-interface SendTransactionOptions extends SendOptions {
+interface SendTransactionOptions {
     skipPreflight?: boolean;
+    maxRetries?: bigint;
+    minContextSlot?: Slot;
+    preflightCommitment?: Commitment;
 }
 interface ConfirmTransactionOptions {
     commitment?: Commitment;
     timeoutMs?: number;
 }
+interface TransactionStatus {
+    slot: Slot;
+    confirmations: bigint | null;
+    err: unknown | null;
+    confirmationStatus: Commitment | null;
+}
 interface TransactionConfirmation {
-    signature: TransactionSignature;
+    signature: Signature;
     commitment: Commitment;
-    result: RpcResponseAndContext<SignatureResult>;
+    status: TransactionStatus;
 }
 
-export { createSolanaClient as j };
-export type { ConfirmTransactionOptions as C, SendTransactionOptions as S, TransactionConfirmation as T, SolanaChain as a, SolanaClient as b, SolanaCluster as c, SolanaConfig as d, SolanaContext as e, SolanaSignMessageResult as f, SolanaTransaction as g, SolanaWallet as h, SolanaWalletInfo as i };
+export { createSolanaClient as k };
+export type { ConfirmTransactionOptions as C, SendTransactionOptions as S, TransactionConfirmation as T, SolanaChain as a, SolanaClient as b, SolanaCluster as c, SolanaConfig as d, SolanaContext as e, SolanaSignMessageResult as f, SolanaTransaction as g, SolanaWallet as h, SolanaWalletInfo as i, TransactionStatus as j };

package/dist/shared/{core.DAUuCWrr.d.cts → core.DMgTrB_2.d.ts}

@@ -1,8 +1,5 @@
-/// <reference path="../../types/web3-compat.d.ts" />
-/// <reference path="../../types/buffer.d.ts" />
-import { Commitment, SendOptions, Connection, Transaction, VersionedTransaction, PublicKey, TransactionSignature, RpcResponseAndContext, SignatureResult } from '@solana/web3-compat';
 import * as _solana_kit from '@solana/kit';
-import { Address } from '@solana/kit';
+import { Commitment, Slot, Address, Signature } from '@solana/kit';
 
 /**
  * Create a @solana/kit client for the given Solana configuration.
@@ -30,17 +27,15 @@ interface SolanaContext {
     cluster: SolanaCluster;
     endpoint: string;
     wsEndpoint: string;
-    connection: Connection;
     client: SolanaClient;
 }
-type SolanaTransaction = Transaction | VersionedTransaction;
+type SolanaTransaction = Uint8Array;
 interface SolanaSignMessageResult {
     signedMessage: Uint8Array;
     signature: Uint8Array;
 }
 interface SolanaWallet {
-    publicKey: PublicKey | null;
-    address?: Address;
+    publicKey: Address | null;
     connected: boolean;
     connecting?: boolean;
     disconnecting?: boolean;
@@ -49,10 +44,10 @@ interface SolanaWallet {
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     signMessage?: (message: Uint8Array) => Promise<SolanaSignMessageResult>;
-    signTransaction?: <T extends SolanaTransaction>(transaction: T) => Promise<T>;
-    signAllTransactions?: <T extends SolanaTransaction>(transactions: T[]) => Promise<T[]>;
-    signAndSendTransaction?: (transaction: SolanaTransaction, options?: SendOptions) => Promise<{
-        signature: TransactionSignature;
+    signTransaction?: (transaction: SolanaTransaction) => Promise<SolanaTransaction>;
+    signAllTransactions?: (transactions: SolanaTransaction[]) => Promise<SolanaTransaction[]>;
+    signAndSendTransaction?: (transaction: SolanaTransaction, options?: SendTransactionOptions) => Promise<{
+        signature: string;
     }>;
 }
 interface SolanaWalletInfo {
@@ -81,18 +76,27 @@ interface SolanaWalletInfo {
     }[];
     wallet: unknown;
 }
-interface SendTransactionOptions extends SendOptions {
+interface SendTransactionOptions {
     skipPreflight?: boolean;
+    maxRetries?: bigint;
+    minContextSlot?: Slot;
+    preflightCommitment?: Commitment;
 }
 interface ConfirmTransactionOptions {
     commitment?: Commitment;
     timeoutMs?: number;
 }
+interface TransactionStatus {
+    slot: Slot;
+    confirmations: bigint | null;
+    err: unknown | null;
+    confirmationStatus: Commitment | null;
+}
 interface TransactionConfirmation {
-    signature: TransactionSignature;
+    signature: Signature;
     commitment: Commitment;
-    result: RpcResponseAndContext<SignatureResult>;
+    status: TransactionStatus;
 }
 
-export { createSolanaClient as j };
-export type { ConfirmTransactionOptions as C, SendTransactionOptions as S, TransactionConfirmation as T, SolanaChain as a, SolanaClient as b, SolanaCluster as c, SolanaConfig as d, SolanaContext as e, SolanaSignMessageResult as f, SolanaTransaction as g, SolanaWallet as h, SolanaWalletInfo as i };
+export { createSolanaClient as k };
+export type { ConfirmTransactionOptions as C, SendTransactionOptions as S, TransactionConfirmation as T, SolanaChain as a, SolanaClient as b, SolanaCluster as c, SolanaConfig as d, SolanaContext as e, SolanaSignMessageResult as f, SolanaTransaction as g, SolanaWallet as h, SolanaWalletInfo as i, TransactionStatus as j };

package/dist/token-accounts.cjs

@@ -1,55 +1,71 @@
 'use strict';
 
-const splToken = require('@solana/spl-token');
+const kit = require('@solana/kit');
 const errors = require('./errors.cjs');
 
-async function getTokenAccountsByOwner(connection, owner, options) {
-  const commitment = options?.commitment ?? "confirmed";
-  const programId = options?.programId;
-  const programIds = programId ? [programId] : [splToken.TOKEN_PROGRAM_ID, splToken.TOKEN_2022_PROGRAM_ID];
+const TOKEN_PROGRAM_ADDRESS = kit.address("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+const TOKEN_2022_PROGRAM_ADDRESS = kit.address("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
+async function getTokenAccountsByOwner(client, owner, options = {}) {
+  const programIds = options.programId ? [options.programId] : [TOKEN_PROGRAM_ADDRESS, TOKEN_2022_PROGRAM_ADDRESS];
   try {
-    const responses = await Promise.all(
-      programIds.map(async (pid) => {
-        const resp = await connection.getTokenAccountsByOwner(owner, { programId: pid }, commitment);
-        return resp.value.map(
-          (info) => splToken.unpackAccount(info.pubkey, { data: info.account.data })
-        );
-      })
+    const results = await Promise.all(
+      programIds.map(
+        (programId) => fetchParsedTokenAccounts(client, owner, { programId }, options.commitment)
+      )
     );
-    return responses.flat();
+    return results.flat();
   } catch (cause) {
     throw errors.normalizeSolanaError(cause, "RPC_FAILURE");
   }
 }
-async function getTokenAccount(connection, address) {
+async function getTokenAccount(client, address2, commitment) {
   try {
-    const accountInfo = await connection.getAccountInfo(address);
-    if (!accountInfo) {
+    const response = await client.rpc.getAccountInfo(address2, { encoding: "jsonParsed", commitment }).send();
+    const accountInfo = response.value;
+    if (!accountInfo || !isParsedTokenAccount(accountInfo.data) || accountInfo.data.parsed.type !== "account") {
       return null;
     }
-    return splToken.unpackAccount(address, accountInfo);
+    return tokenAccountInfoFromParsed(address2, accountInfo.data);
   } catch (cause) {
     throw errors.normalizeSolanaError(cause, "RPC_FAILURE");
   }
 }
-async function getTokenBalance(connection, mint, owner) {
+async function getTokenBalance(client, mint, owner, commitment) {
   try {
-    const ata = splToken.getAssociatedTokenAddressSync(mint, owner, true);
-    const accountInfo = await connection.getAccountInfo(ata);
-    if (!accountInfo) {
+    const [account] = await fetchParsedTokenAccounts(client, owner, { mint }, commitment);
+    if (!account) {
       return null;
     }
-    const tokenAccount = splToken.unpackAccount(ata, accountInfo);
-    const mintAccountInfo = await connection.getAccountInfo(mint);
-    if (!mintAccountInfo) {
-      return null;
-    }
-    const mintAccount = splToken.unpackMint(mint, mintAccountInfo);
-    return { amount: tokenAccount.amount, decimals: mintAccount.decimals };
+    return { amount: account.amount, decimals: account.decimals };
   } catch (cause) {
     throw errors.normalizeSolanaError(cause, "RPC_FAILURE");
   }
 }
+async function fetchParsedTokenAccounts(client, owner, filter, commitment) {
+  const response = await client.rpc.getTokenAccountsByOwner(owner, filter, { encoding: "jsonParsed", commitment }).send();
+  return response.value.filter(({ account }) => isParsedTokenAccount(account.data)).map(({ pubkey, account }) => tokenAccountInfoFromParsed(pubkey, account.data));
+}
+function isParsedTokenAccount(data) {
+  return typeof data === "object" && data !== null && "parsed" in data;
+}
+function tokenAccountInfoFromParsed(address2, data) {
+  if (data.parsed.type !== "account") {
+    throw new Error(`Token account ${address2} is not a parsed token account`);
+  }
+  const parsed = data.parsed.info;
+  if (!parsed) {
+    throw new Error(`Token account ${address2} has no parsed data`);
+  }
+  return {
+    address: address2,
+    mint: parsed.mint,
+    owner: parsed.owner,
+    amount: BigInt(parsed.tokenAmount.amount),
+    decimals: parsed.tokenAmount.decimals,
+    state: parsed.state,
+    isNative: parsed.isNative
+  };
+}
 
 exports.getTokenAccount = getTokenAccount;
 exports.getTokenAccountsByOwner = getTokenAccountsByOwner;

package/dist/token-accounts.d.cts

@@ -1,35 +1,35 @@
-import { PublicKey, Connection } from '@vue-solana/core/web3';
-import { Account } from '@solana/spl-token';
+import { Address, Commitment } from '@solana/kit';
+import { b as SolanaClient } from './shared/core.DMgTrB_2.cjs';
 
+interface TokenAccountInfo {
+    address: Address;
+    mint: Address;
+    owner: Address;
+    amount: bigint;
+    decimals: number;
+    state: "frozen" | "initialized" | "uninitialized";
+    isNative: boolean;
+}
 interface TokenAccountsByOwnerOptions {
-    commitment?: "processed" | "confirmed" | "finalized";
-    programId?: PublicKey;
+    commitment?: Commitment;
+    programId?: Address;
 }
 /**
- * Get all SPL token accounts for an owner using the legacy `Connection` API.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Get all SPL token accounts for an owner using parsed kit RPC reads.
  */
-declare function getTokenAccountsByOwner(connection: Connection, owner: PublicKey, options?: TokenAccountsByOwnerOptions): Promise<Account[]>;
+declare function getTokenAccountsByOwner(client: SolanaClient, owner: Address, options?: TokenAccountsByOwnerOptions): Promise<TokenAccountInfo[]>;
 /**
- * Get a single token account using the legacy `Connection` API.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Get a single parsed token account at the given address.
  */
-declare function getTokenAccount(connection: Connection, address: PublicKey): Promise<Account | null>;
+declare function getTokenAccount(client: SolanaClient, address: Address, commitment?: Commitment): Promise<TokenAccountInfo | null>;
 interface TokenBalanceResult {
     amount: bigint;
     decimals: number;
 }
 /**
- * Read the token balance of the associated token account for an owner.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Read the token balance of the accounts an owner holds for a given mint.
  */
-declare function getTokenBalance(connection: Connection, mint: PublicKey, owner: PublicKey): Promise<TokenBalanceResult | null>;
+declare function getTokenBalance(client: SolanaClient, mint: Address, owner: Address, commitment?: Commitment): Promise<TokenBalanceResult | null>;
 
 export { getTokenAccount, getTokenAccountsByOwner, getTokenBalance };
-export type { TokenAccountsByOwnerOptions, TokenBalanceResult };
+export type { TokenAccountInfo, TokenAccountsByOwnerOptions, TokenBalanceResult };

package/dist/token-accounts.d.mts

@@ -1,35 +1,35 @@
-import { PublicKey, Connection } from '@vue-solana/core/web3';
-import { Account } from '@solana/spl-token';
+import { Address, Commitment } from '@solana/kit';
+import { b as SolanaClient } from './shared/core.DMgTrB_2.mjs';
 
+interface TokenAccountInfo {
+    address: Address;
+    mint: Address;
+    owner: Address;
+    amount: bigint;
+    decimals: number;
+    state: "frozen" | "initialized" | "uninitialized";
+    isNative: boolean;
+}
 interface TokenAccountsByOwnerOptions {
-    commitment?: "processed" | "confirmed" | "finalized";
-    programId?: PublicKey;
+    commitment?: Commitment;
+    programId?: Address;
 }
 /**
- * Get all SPL token accounts for an owner using the legacy `Connection` API.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Get all SPL token accounts for an owner using parsed kit RPC reads.
  */
-declare function getTokenAccountsByOwner(connection: Connection, owner: PublicKey, options?: TokenAccountsByOwnerOptions): Promise<Account[]>;
+declare function getTokenAccountsByOwner(client: SolanaClient, owner: Address, options?: TokenAccountsByOwnerOptions): Promise<TokenAccountInfo[]>;
 /**
- * Get a single token account using the legacy `Connection` API.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Get a single parsed token account at the given address.
  */
-declare function getTokenAccount(connection: Connection, address: PublicKey): Promise<Account | null>;
+declare function getTokenAccount(client: SolanaClient, address: Address, commitment?: Commitment): Promise<TokenAccountInfo | null>;
 interface TokenBalanceResult {
     amount: bigint;
     decimals: number;
 }
 /**
- * Read the token balance of the associated token account for an owner.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Read the token balance of the accounts an owner holds for a given mint.
  */
-declare function getTokenBalance(connection: Connection, mint: PublicKey, owner: PublicKey): Promise<TokenBalanceResult | null>;
+declare function getTokenBalance(client: SolanaClient, mint: Address, owner: Address, commitment?: Commitment): Promise<TokenBalanceResult | null>;
 
 export { getTokenAccount, getTokenAccountsByOwner, getTokenBalance };
-export type { TokenAccountsByOwnerOptions, TokenBalanceResult };
+export type { TokenAccountInfo, TokenAccountsByOwnerOptions, TokenBalanceResult };

package/dist/token-accounts.d.ts

@@ -1,35 +1,35 @@
-import { PublicKey, Connection } from '@vue-solana/core/web3';
-import { Account } from '@solana/spl-token';
+import { Address, Commitment } from '@solana/kit';
+import { b as SolanaClient } from './shared/core.DMgTrB_2.js';
 
+interface TokenAccountInfo {
+    address: Address;
+    mint: Address;
+    owner: Address;
+    amount: bigint;
+    decimals: number;
+    state: "frozen" | "initialized" | "uninitialized";
+    isNative: boolean;
+}
 interface TokenAccountsByOwnerOptions {
-    commitment?: "processed" | "confirmed" | "finalized";
-    programId?: PublicKey;
+    commitment?: Commitment;
+    programId?: Address;
 }
 /**
- * Get all SPL token accounts for an owner using the legacy `Connection` API.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Get all SPL token accounts for an owner using parsed kit RPC reads.
  */
-declare function getTokenAccountsByOwner(connection: Connection, owner: PublicKey, options?: TokenAccountsByOwnerOptions): Promise<Account[]>;
+declare function getTokenAccountsByOwner(client: SolanaClient, owner: Address, options?: TokenAccountsByOwnerOptions): Promise<TokenAccountInfo[]>;
 /**
- * Get a single token account using the legacy `Connection` API.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Get a single parsed token account at the given address.
  */
-declare function getTokenAccount(connection: Connection, address: PublicKey): Promise<Account | null>;
+declare function getTokenAccount(client: SolanaClient, address: Address, commitment?: Commitment): Promise<TokenAccountInfo | null>;
 interface TokenBalanceResult {
     amount: bigint;
     decimals: number;
 }
 /**
- * Read the token balance of the associated token account for an owner.
- *
- * @deprecated Prefer `@solana-program/token` reads against `client.rpc` from
- * `@vue-solana/core/kit`.
+ * Read the token balance of the accounts an owner holds for a given mint.
  */
-declare function getTokenBalance(connection: Connection, mint: PublicKey, owner: PublicKey): Promise<TokenBalanceResult | null>;
+declare function getTokenBalance(client: SolanaClient, mint: Address, owner: Address, commitment?: Commitment): Promise<TokenBalanceResult | null>;
 
 export { getTokenAccount, getTokenAccountsByOwner, getTokenBalance };
-export type { TokenAccountsByOwnerOptions, TokenBalanceResult };
+export type { TokenAccountInfo, TokenAccountsByOwnerOptions, TokenBalanceResult };

package/dist/token-accounts.mjs

@@ -1,52 +1,68 @@
-import { unpackAccount, TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, unpackMint } from '@solana/spl-token';
+import { address } from '@solana/kit';
 import { normalizeSolanaError } from './errors.mjs';
 
-async function getTokenAccountsByOwner(connection, owner, options) {
-  const commitment = options?.commitment ?? "confirmed";
-  const programId = options?.programId;
-  const programIds = programId ? [programId] : [TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID];
+const TOKEN_PROGRAM_ADDRESS = address("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+const TOKEN_2022_PROGRAM_ADDRESS = address("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
+async function getTokenAccountsByOwner(client, owner, options = {}) {
+  const programIds = options.programId ? [options.programId] : [TOKEN_PROGRAM_ADDRESS, TOKEN_2022_PROGRAM_ADDRESS];
   try {
-    const responses = await Promise.all(
-      programIds.map(async (pid) => {
-        const resp = await connection.getTokenAccountsByOwner(owner, { programId: pid }, commitment);
-        return resp.value.map(
-          (info) => unpackAccount(info.pubkey, { data: info.account.data })
-        );
-      })
+    const results = await Promise.all(
+      programIds.map(
+        (programId) => fetchParsedTokenAccounts(client, owner, { programId }, options.commitment)
+      )
     );
-    return responses.flat();
+    return results.flat();
   } catch (cause) {
     throw normalizeSolanaError(cause, "RPC_FAILURE");
   }
 }
-async function getTokenAccount(connection, address) {
+async function getTokenAccount(client, address2, commitment) {
   try {
-    const accountInfo = await connection.getAccountInfo(address);
-    if (!accountInfo) {
+    const response = await client.rpc.getAccountInfo(address2, { encoding: "jsonParsed", commitment }).send();
+    const accountInfo = response.value;
+    if (!accountInfo || !isParsedTokenAccount(accountInfo.data) || accountInfo.data.parsed.type !== "account") {
       return null;
     }
-    return unpackAccount(address, accountInfo);
+    return tokenAccountInfoFromParsed(address2, accountInfo.data);
   } catch (cause) {
     throw normalizeSolanaError(cause, "RPC_FAILURE");
   }
 }
-async function getTokenBalance(connection, mint, owner) {
+async function getTokenBalance(client, mint, owner, commitment) {
   try {
-    const ata = getAssociatedTokenAddressSync(mint, owner, true);
-    const accountInfo = await connection.getAccountInfo(ata);
-    if (!accountInfo) {
+    const [account] = await fetchParsedTokenAccounts(client, owner, { mint }, commitment);
+    if (!account) {
       return null;
     }
-    const tokenAccount = unpackAccount(ata, accountInfo);
-    const mintAccountInfo = await connection.getAccountInfo(mint);
-    if (!mintAccountInfo) {
-      return null;
-    }
-    const mintAccount = unpackMint(mint, mintAccountInfo);
-    return { amount: tokenAccount.amount, decimals: mintAccount.decimals };
+    return { amount: account.amount, decimals: account.decimals };
   } catch (cause) {
     throw normalizeSolanaError(cause, "RPC_FAILURE");
   }
 }
+async function fetchParsedTokenAccounts(client, owner, filter, commitment) {
+  const response = await client.rpc.getTokenAccountsByOwner(owner, filter, { encoding: "jsonParsed", commitment }).send();
+  return response.value.filter(({ account }) => isParsedTokenAccount(account.data)).map(({ pubkey, account }) => tokenAccountInfoFromParsed(pubkey, account.data));
+}
+function isParsedTokenAccount(data) {
+  return typeof data === "object" && data !== null && "parsed" in data;
+}
+function tokenAccountInfoFromParsed(address2, data) {
+  if (data.parsed.type !== "account") {
+    throw new Error(`Token account ${address2} is not a parsed token account`);
+  }
+  const parsed = data.parsed.info;
+  if (!parsed) {
+    throw new Error(`Token account ${address2} has no parsed data`);
+  }
+  return {
+    address: address2,
+    mint: parsed.mint,
+    owner: parsed.owner,
+    amount: BigInt(parsed.tokenAmount.amount),
+    decimals: parsed.tokenAmount.decimals,
+    state: parsed.state,
+    isNative: parsed.isNative
+  };
+}
 
 export { getTokenAccount, getTokenAccountsByOwner, getTokenBalance };