@vue-solana/vue 0.7.0 → 0.8.0

package/dist/shared/{vue.DWiQYhb8.cjs → vue.BnSjOzvb.cjs}

@@ -1,15 +1,18 @@
 'use strict';
 
+const errors = require('@vue-solana/core/errors');
+const timeout = require('@vue-solana/core/timeout');
 const transaction = require('@vue-solana/core/transaction');
+const wallet = require('@vue-solana/core/wallet');
 const vue = require('vue');
 const useConnection = require('./vue.CwhEmATP.cjs');
-const useWallet = require('./vue.BwipRa1w.cjs');
-const useTransactionConfirmation = require('./vue.DHVYJk8P.cjs');
+const useWallet = require('./vue.DfeKj9vL.cjs');
+const useTransactionConfirmation = require('./vue.BeA8WQ2g.cjs');
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
 function useSignAndSendTransaction() {
   const connection = useConnection.useConnection();
-  const { wallet } = useWallet.useWallet();
+  const { wallet: wallet$1 } = useWallet.useWallet();
   const signature = vue.ref(null);
   const confirmation = vue.ref(null);
   const status = vue.ref("idle");
@@ -24,17 +27,19 @@ function useSignAndSendTransaction() {
     loading.value = true;
     error.value = null;
     confirmation.value = null;
-    const activeWallet = wallet.value;
+    const activeWallet = wallet$1.value;
     if (!activeWallet) {
-      const cause = new Error("No Solana wallet is configured");
-      error.value = cause;
+      const normalizedError = wallet.createNoWalletSelectedError();
+      error.value = normalizedError;
       status.value = "error";
       loading.value = false;
-      throw cause;
+      throw normalizedError;
     }
     try {
-      const nextSignature = await withWalletTransactionTimeout(
-        transaction.signAndSendTransaction(connection, activeWallet, transaction$1, transactionOptions)
+      const nextSignature = await timeout.withSolanaTimeout(
+        transaction.signAndSendTransaction(connection, activeWallet, transaction$1, transactionOptions),
+        SIGN_AND_SEND_TIMEOUT_MS,
+        "Wallet transaction did not return a result. Check your wallet or explorer for the final status."
       );
       if (currentExecutionId === executionId) {
         signature.value = nextSignature;
@@ -54,11 +59,12 @@ function useSignAndSendTransaction() {
       }
       return nextSignature;
     } catch (cause) {
+      const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       if (currentExecutionId === executionId) {
-        error.value = cause;
+        error.value = normalizedError;
         status.value = "error";
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (currentExecutionId === executionId) {
         loading.value = false;
@@ -74,24 +80,5 @@ function useSignAndSendTransaction() {
     execute
   };
 }
-async function withWalletTransactionTimeout(promise) {
-  let timeoutId;
-  try {
-    const timeout = new Promise((_, reject) => {
-      timeoutId = setTimeout(() => {
-        reject(
-          new Error(
-            "Wallet transaction did not return a result. Check your wallet or explorer for the final status."
-          )
-        );
-      }, SIGN_AND_SEND_TIMEOUT_MS);
-    });
-    return await Promise.race([promise, timeout]);
-  } finally {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  }
-}
 
 exports.useSignAndSendTransaction = useSignAndSendTransaction;

package/dist/shared/{vue.JC5FdU2O.mjs → vue.BzopW_4m.mjs}

@@ -1,3 +1,4 @@
+import { normalizeSolanaError, createSolanaError } from '@vue-solana/core/errors';
 import bs58 from 'bs58';
 import { shallowRef, onMounted, onUnmounted, watch, toValue } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
@@ -37,11 +38,12 @@ function useSignatureStatus(signature, options = {}) {
       }
       return nextStatus;
     } catch (cause) {
+      const normalizedError = normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {
         status.value = null;
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (requestId === refreshId) {
         loading.value = false;
@@ -66,13 +68,13 @@ function useSignatureStatus(signature, options = {}) {
       return;
     }
     if (options.pollIntervalMs <= 0) {
-      error.value = new RangeError("pollIntervalMs must be greater than 0");
+      error.value = createSolanaError("RPC_FAILURE", "pollIntervalMs must be greater than 0");
       return;
     }
     try {
       parseTransactionSignature(value);
     } catch (cause) {
-      error.value = cause;
+      error.value = normalizeSolanaError(cause, "RPC_FAILURE");
       return;
     }
     pollId = setInterval(() => {
@@ -93,7 +95,7 @@ function useSignatureStatus(signature, options = {}) {
     try {
       await connection.removeSignatureListener(currentSubscriptionId);
     } catch (cause) {
-      error.value = cause;
+      error.value = normalizeSolanaError(cause, "RPC_FAILURE");
     }
   }
   async function startSubscription() {
@@ -131,7 +133,7 @@ function useSignatureStatus(signature, options = {}) {
       subscriptionId = nextSubscriptionId;
     } catch (cause) {
       if (requestId === subscriptionStartId) {
-        error.value = cause;
+        error.value = normalizeSolanaError(cause, "RPC_FAILURE");
       }
     }
   }

package/dist/shared/{vue.gLqkzJY4.mjs → vue.C4d2JA8U.mjs}

@@ -1,24 +1,7 @@
+import { normalizeSolanaError } from '@vue-solana/core/errors';
+import { withSolanaTimeout } from '@vue-solana/core/timeout';
 import { ref } from 'vue';
 
-async function withTimeout(promise, timeoutMs, message) {
-  if (!timeoutMs) {
-    return promise;
-  }
-  let timeoutId;
-  try {
-    const timeout = new Promise((_, reject) => {
-      timeoutId = setTimeout(() => {
-        reject(new Error(message));
-      }, timeoutMs);
-    });
-    return await Promise.race([promise, timeout]);
-  } finally {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  }
-}
-
 function useTransaction(handler, options = {}) {
   const signature = ref(null);
   const loading = ref(false);
@@ -29,7 +12,7 @@ function useTransaction(handler, options = {}) {
     loading.value = true;
     error.value = null;
     try {
-      const nextSignature = await withTimeout(
+      const nextSignature = await withSolanaTimeout(
         handler(...args),
         options.timeoutMs,
         options.timeoutMessage ?? "Transaction did not return a result before timing out."
@@ -39,10 +22,11 @@ function useTransaction(handler, options = {}) {
       }
       return nextSignature;
     } catch (cause) {
+      const normalizedError = normalizeSolanaError(cause, "RPC_FAILURE");
       if (currentExecutionId === executionId) {
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (currentExecutionId === executionId) {
         loading.value = false;
@@ -57,4 +41,4 @@ function useTransaction(handler, options = {}) {
   };
 }
 
-export { useTransaction as u, withTimeout as w };
+export { useTransaction as u };

package/dist/shared/{vue.DQi38JeF.cjs → vue.CE5i8KZZ.cjs}

@@ -1,26 +1,9 @@
 'use strict';
 
+const errors = require('@vue-solana/core/errors');
+const timeout = require('@vue-solana/core/timeout');
 const vue = require('vue');
 
-async function withTimeout(promise, timeoutMs, message) {
-  if (!timeoutMs) {
-    return promise;
-  }
-  let timeoutId;
-  try {
-    const timeout = new Promise((_, reject) => {
-      timeoutId = setTimeout(() => {
-        reject(new Error(message));
-      }, timeoutMs);
-    });
-    return await Promise.race([promise, timeout]);
-  } finally {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  }
-}
-
 function useTransaction(handler, options = {}) {
   const signature = vue.ref(null);
   const loading = vue.ref(false);
@@ -31,7 +14,7 @@ function useTransaction(handler, options = {}) {
     loading.value = true;
     error.value = null;
     try {
-      const nextSignature = await withTimeout(
+      const nextSignature = await timeout.withSolanaTimeout(
         handler(...args),
         options.timeoutMs,
         options.timeoutMessage ?? "Transaction did not return a result before timing out."
@@ -41,10 +24,11 @@ function useTransaction(handler, options = {}) {
       }
       return nextSignature;
     } catch (cause) {
+      const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       if (currentExecutionId === executionId) {
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (currentExecutionId === executionId) {
         loading.value = false;
@@ -60,4 +44,3 @@ function useTransaction(handler, options = {}) {
 }
 
 exports.useTransaction = useTransaction;
-exports.withTimeout = withTimeout;

package/dist/shared/{vue.7TzeDJZX.mjs → vue.Cl3hXlXK.mjs}

@@ -1,4 +1,5 @@
 import { parsePublicKey } from '@vue-solana/core/address';
+import { normalizeSolanaError } from '@vue-solana/core/errors';
 import { shallowRef, onMounted, onUnmounted, watch, toValue } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
 import { t as tryUseSolana } from './vue.1M_c5FWA.mjs';
@@ -36,11 +37,12 @@ function useAccountInfo(address, options = {}) {
       }
       return nextAccountInfo;
     } catch (cause) {
+      const normalizedError = normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {
         accountInfo.value = null;
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (requestId === refreshId) {
         loading.value = false;
@@ -61,7 +63,7 @@ function useAccountInfo(address, options = {}) {
     try {
       await connection.removeAccountChangeListener(currentSubscriptionId);
     } catch (cause) {
-      error.value = cause;
+      error.value = normalizeSolanaError(cause, "RPC_FAILURE");
     }
   }
   async function startWatching() {
@@ -96,7 +98,7 @@ function useAccountInfo(address, options = {}) {
       subscriptionId = nextSubscriptionId;
     } catch (cause) {
       if (requestId === watchId) {
-        error.value = cause;
+        error.value = normalizeSolanaError(cause, "RPC_FAILURE");
       }
     }
   }

package/dist/shared/{vue.jOsz34kz.mjs → vue.CxMrojxC.mjs}

@@ -1,4 +1,5 @@
 import { confirmTransactionSignature } from '@vue-solana/core/transaction';
+import { normalizeSolanaError } from '@vue-solana/core/errors';
 import { ref } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
 
@@ -36,11 +37,12 @@ function useTransactionConfirmation(defaultOptions = {}) {
       }
       return nextConfirmation;
     } catch (cause) {
+      const normalizedError = normalizeSolanaError(cause, "RPC_FAILURE");
       if (currentExecutionId === executionId) {
-        error.value = cause;
+        error.value = normalizedError;
         status.value = "error";
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (currentExecutionId === executionId) {
         loading.value = false;

package/dist/shared/{vue.CUTLu1Gf.mjs → vue.CzTu_DPr.mjs}

@@ -1,4 +1,5 @@
 import { parsePublicKey } from '@vue-solana/core/address';
+import { normalizeSolanaError } from '@vue-solana/core/errors';
 import { shallowRef, onMounted, onUnmounted, watch, toValue } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
 import { t as tryUseSolana } from './vue.1M_c5FWA.mjs';
@@ -37,11 +38,12 @@ function useProgramAccounts(programId, options = {}) {
       }
       return nextAccounts;
     } catch (cause) {
+      const normalizedError = normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {
         accounts.value = [];
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (requestId === refreshId) {
         loading.value = false;

package/dist/shared/{vue.dmuispJ3.cjs → vue.D1JtJ2lD.cjs}

@@ -1,6 +1,7 @@
 'use strict';
 
 const address = require('@vue-solana/core/address');
+const errors = require('@vue-solana/core/errors');
 const vue = require('vue');
 const useConnection = require('./vue.CwhEmATP.cjs');
 const useSolana = require('./vue.C4tLiG3R.cjs');
@@ -39,11 +40,12 @@ function useProgramAccounts(programId, options = {}) {
       }
       return nextAccounts;
     } catch (cause) {
+      const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {
         accounts.value = [];
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (requestId === refreshId) {
         loading.value = false;

package/dist/shared/{vue.DGhodYJh.d.mts → vue.DL3z5PxP.d.cts}

@@ -1,3 +1,4 @@
+import { SolanaError } from '@vue-solana/core/errors';
 import { SolanaContext, SolanaWallet, SolanaWalletInfo } from '@vue-solana/core/types';
 import { Ref, InjectionKey } from 'vue';
 
@@ -5,7 +6,7 @@ type SolanaConnectionStatus = "idle" | "checking" | "connected" | "error";
 interface VueSolanaContext extends SolanaContext {
     wallet: Ref<SolanaWallet | null>;
     status: Ref<SolanaConnectionStatus>;
-    error: Ref<string | null>;
+    error: Ref<SolanaError | null>;
     latestBlockhash: Ref<string | null>;
     wallets: Ref<SolanaWalletInfo[]>;
     selectedWallet: Ref<SolanaWalletInfo | null>;

package/dist/shared/{vue.DGhodYJh.d.ts → vue.DL3z5PxP.d.mts}

@@ -1,3 +1,4 @@
+import { SolanaError } from '@vue-solana/core/errors';
 import { SolanaContext, SolanaWallet, SolanaWalletInfo } from '@vue-solana/core/types';
 import { Ref, InjectionKey } from 'vue';
 
@@ -5,7 +6,7 @@ type SolanaConnectionStatus = "idle" | "checking" | "connected" | "error";
 interface VueSolanaContext extends SolanaContext {
     wallet: Ref<SolanaWallet | null>;
     status: Ref<SolanaConnectionStatus>;
-    error: Ref<string | null>;
+    error: Ref<SolanaError | null>;
     latestBlockhash: Ref<string | null>;
     wallets: Ref<SolanaWalletInfo[]>;
     selectedWallet: Ref<SolanaWalletInfo | null>;

package/dist/shared/{vue.DGhodYJh.d.cts → vue.DL3z5PxP.d.ts}

@@ -1,3 +1,4 @@
+import { SolanaError } from '@vue-solana/core/errors';
 import { SolanaContext, SolanaWallet, SolanaWalletInfo } from '@vue-solana/core/types';
 import { Ref, InjectionKey } from 'vue';
 
@@ -5,7 +6,7 @@ type SolanaConnectionStatus = "idle" | "checking" | "connected" | "error";
 interface VueSolanaContext extends SolanaContext {
     wallet: Ref<SolanaWallet | null>;
     status: Ref<SolanaConnectionStatus>;
-    error: Ref<string | null>;
+    error: Ref<SolanaError | null>;
     latestBlockhash: Ref<string | null>;
     wallets: Ref<SolanaWalletInfo[]>;
     selectedWallet: Ref<SolanaWalletInfo | null>;

package/dist/shared/{vue.DUufwq8y.cjs → vue.DRlaqQCL.cjs}

@@ -1,5 +1,6 @@
 'use strict';
 
+const errors = require('@vue-solana/core/errors');
 const bs58 = require('bs58');
 const vue = require('vue');
 const useConnection = require('./vue.CwhEmATP.cjs');
@@ -43,11 +44,12 @@ function useSignatureStatus(signature, options = {}) {
       }
       return nextStatus;
     } catch (cause) {
+      const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {
         status.value = null;
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (requestId === refreshId) {
         loading.value = false;
@@ -72,13 +74,13 @@ function useSignatureStatus(signature, options = {}) {
       return;
     }
     if (options.pollIntervalMs <= 0) {
-      error.value = new RangeError("pollIntervalMs must be greater than 0");
+      error.value = errors.createSolanaError("RPC_FAILURE", "pollIntervalMs must be greater than 0");
       return;
     }
     try {
       parseTransactionSignature(value);
     } catch (cause) {
-      error.value = cause;
+      error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       return;
     }
     pollId = setInterval(() => {
@@ -99,7 +101,7 @@ function useSignatureStatus(signature, options = {}) {
     try {
       await connection.removeSignatureListener(currentSubscriptionId);
     } catch (cause) {
-      error.value = cause;
+      error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
     }
   }
   async function startSubscription() {
@@ -137,7 +139,7 @@ function useSignatureStatus(signature, options = {}) {
       subscriptionId = nextSubscriptionId;
     } catch (cause) {
       if (requestId === subscriptionStartId) {
-        error.value = cause;
+        error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       }
     }
   }

package/dist/shared/{vue.BwipRa1w.cjs → vue.DfeKj9vL.cjs}

@@ -1,37 +1,40 @@
 'use strict';
 
+const errors = require('@vue-solana/core/errors');
+const wallet = require('@vue-solana/core/wallet');
 const vue = require('vue');
 const useSolana = require('./vue.C4tLiG3R.cjs');
 
 function useWallet() {
   const solana = useSolana.useSolana();
-  const wallet = solana.wallet;
+  const wallet$1 = solana.wallet;
   const connecting = vue.ref(false);
   const disconnecting = vue.ref(false);
   async function connect() {
-    const activeWallet = wallet.value;
+    const activeWallet = wallet$1.value;
     if (!activeWallet) {
-      throw new Error("No Solana wallet is configured");
+      throw wallet.createNoWalletSelectedError();
     }
     connecting.value = true;
     try {
       const connection = activeWallet.connect();
-      vue.triggerRef(wallet);
+      vue.triggerRef(wallet$1);
       await connection;
-      vue.triggerRef(wallet);
+      vue.triggerRef(wallet$1);
       console.info("[Vue Solana] Wallet connected", {
         publicKey: activeWallet.publicKey?.toBase58() ?? null
       });
     } catch (error) {
-      vue.triggerRef(wallet);
-      console.error("[Vue Solana] Wallet connection failed", error);
-      throw error;
+      const normalizedError = errors.normalizeSolanaError(error, "RPC_FAILURE");
+      vue.triggerRef(wallet$1);
+      console.error("[Vue Solana] Wallet connection failed", normalizedError);
+      throw normalizedError;
     } finally {
       connecting.value = false;
     }
   }
   async function disconnect() {
-    const activeWallet = wallet.value;
+    const activeWallet = wallet$1.value;
     if (!activeWallet) {
       return;
     }
@@ -39,26 +42,27 @@ function useWallet() {
     disconnecting.value = true;
     try {
       await activeWallet.disconnect();
-      vue.triggerRef(wallet);
+      vue.triggerRef(wallet$1);
       console.info("[Vue Solana] Wallet disconnected", { publicKey });
     } catch (error) {
-      vue.triggerRef(wallet);
-      console.error("[Vue Solana] Wallet disconnection failed", error);
-      throw error;
+      const normalizedError = errors.normalizeSolanaError(error, "RPC_FAILURE");
+      vue.triggerRef(wallet$1);
+      console.error("[Vue Solana] Wallet disconnection failed", normalizedError);
+      throw normalizedError;
     } finally {
       disconnecting.value = false;
     }
   }
-  const isConnecting = vue.computed(() => Boolean(connecting.value || wallet.value?.connecting));
+  const isConnecting = vue.computed(() => Boolean(connecting.value || wallet$1.value?.connecting));
   const isDisconnecting = vue.computed(
-    () => Boolean(disconnecting.value || wallet.value?.disconnecting)
+    () => Boolean(disconnecting.value || wallet$1.value?.disconnecting)
   );
-  const canConnect = vue.computed(() => Boolean(wallet.value?.connect));
-  const canDisconnect = vue.computed(() => Boolean(wallet.value?.disconnect));
-  const canSignMessage = vue.computed(() => Boolean(wallet.value?.signMessage));
-  const canSignTransaction = vue.computed(() => Boolean(wallet.value?.signTransaction));
-  const canSignAllTransactions = vue.computed(() => Boolean(wallet.value?.signAllTransactions));
-  const canSignAndSendTransaction = vue.computed(() => Boolean(wallet.value?.signAndSendTransaction));
+  const canConnect = vue.computed(() => Boolean(wallet$1.value?.connect));
+  const canDisconnect = vue.computed(() => Boolean(wallet$1.value?.disconnect));
+  const canSignMessage = vue.computed(() => Boolean(wallet$1.value?.signMessage));
+  const canSignTransaction = vue.computed(() => Boolean(wallet$1.value?.signTransaction));
+  const canSignAllTransactions = vue.computed(() => Boolean(wallet$1.value?.signAllTransactions));
+  const canSignAndSendTransaction = vue.computed(() => Boolean(wallet$1.value?.signAndSendTransaction));
   const capabilities = vue.computed(() => ({
     connect: canConnect.value,
     disconnect: canDisconnect.value,
@@ -68,9 +72,9 @@ function useWallet() {
     signAndSendTransaction: canSignAndSendTransaction.value
   }));
   return {
-    wallet,
-    publicKey: vue.computed(() => wallet.value?.publicKey ?? null),
-    connected: vue.computed(() => Boolean(wallet.value?.connected && wallet.value.publicKey)),
+    wallet: wallet$1,
+    publicKey: vue.computed(() => wallet$1.value?.publicKey ?? null),
+    connected: vue.computed(() => Boolean(wallet$1.value?.connected && wallet$1.value.publicKey)),
     connecting: isConnecting,
     disconnecting: isDisconnecting,
     loading: vue.computed(() => isConnecting.value || isDisconnecting.value),

package/dist/shared/{vue.D1knFN3X.cjs → vue.DuI_Jm5P.cjs}

@@ -1,8 +1,9 @@
 'use strict';
 
+const errors = require('@vue-solana/core/errors');
 const wallet = require('@vue-solana/core/wallet');
 const vue = require('vue');
-const useWallet = require('./vue.BwipRa1w.cjs');
+const useWallet = require('./vue.DfeKj9vL.cjs');
 
 function useSignMessage() {
   const { wallet: wallet$1 } = useWallet.useWallet();
@@ -21,11 +22,11 @@ function useSignMessage() {
     signature.value = null;
     const activeWallet = wallet$1.value;
     if (!activeWallet) {
-      const cause = new Error("No Solana wallet is configured");
-      error.value = cause;
+      const normalizedError = wallet.createNoWalletSelectedError();
+      error.value = normalizedError;
       status.value = "error";
       loading.value = false;
-      throw cause;
+      throw normalizedError;
     }
     try {
       wallet.assertWalletCanSignMessage(activeWallet);
@@ -37,7 +38,7 @@ function useSignMessage() {
       }
       return result;
     } catch (cause) {
-      const normalizedError = normalizeError(cause);
+      const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       if (currentExecutionId === executionId) {
         error.value = normalizedError;
         status.value = "error";
@@ -58,8 +59,5 @@ function useSignMessage() {
     execute
   };
 }
-function normalizeError(cause) {
-  return cause instanceof Error ? cause : new Error(String(cause));
-}
 
 exports.useSignMessage = useSignMessage;

package/dist/shared/{vue.D_AM1Nl8.cjs → vue.NFoc_-Kt.cjs}

@@ -1,11 +1,12 @@
 'use strict';
 
-const web3Compat = require('@solana/web3-compat');
+const address = require('@vue-solana/core/address');
+const errors = require('@vue-solana/core/errors');
 const vue = require('vue');
 const useConnection = require('./vue.CwhEmATP.cjs');
 const useSolana = require('./vue.C4tLiG3R.cjs');
 
-function useBalance(address, commitment) {
+function useBalance(address$1, commitment) {
   const solana = useSolana.tryUseSolana();
   const connection = solana?.connection ?? useConnection.useConnection();
   const balance = vue.shallowRef(null);
@@ -14,7 +15,7 @@ function useBalance(address, commitment) {
   let refreshId = 0;
   async function refresh() {
     const requestId = ++refreshId;
-    const value = vue.toValue(address);
+    const value = vue.toValue(address$1);
     if (!value || !solana) {
       balance.value = null;
       loading.value = false;
@@ -24,17 +25,22 @@ function useBalance(address, commitment) {
     loading.value = true;
     error.value = null;
     try {
-      const publicKey = typeof value === "string" ? new web3Compat.PublicKey(value) : value;
+      const publicKey = address.parsePublicKey(value);
+      if (!publicKey) {
+        balance.value = null;
+        return null;
+      }
       const nextBalance = await connection.getBalance(publicKey, commitment);
       if (requestId === refreshId) {
         balance.value = nextBalance;
       }
       return nextBalance;
     } catch (cause) {
+      const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (requestId === refreshId) {
         loading.value = false;
@@ -45,7 +51,7 @@ function useBalance(address, commitment) {
     void refresh().catch(() => void 0);
   });
   vue.watch(
-    () => vue.toValue(address),
+    () => vue.toValue(address$1),
     () => {
       void refresh().catch(() => void 0);
     }