@vue-solana/vue 0.7.0 → 0.8.0

package/dist/index.cjs

@@ -1,53 +1,62 @@
 'use strict';
 
-const useAccountInfo = require('./shared/vue.BPnK_lsh.cjs');
-const useBalance = require('./shared/vue.D_AM1Nl8.cjs');
+const useAccountInfo = require('./shared/vue.BBoDTIfF.cjs');
+const useBalance = require('./shared/vue.NFoc_-Kt.cjs');
 const useConnection = require('./shared/vue.CwhEmATP.cjs');
-const useProgramAccounts = require('./shared/vue.dmuispJ3.cjs');
+const useProgramAccounts = require('./shared/vue.D1JtJ2lD.cjs');
 const useRpc = require('./shared/vue.COyyrsQU.cjs');
-const useSignMessage = require('./shared/vue.D1knFN3X.cjs');
-const useSignAndSendTransaction = require('./shared/vue.DWiQYhb8.cjs');
-const useSignatureStatus = require('./shared/vue.DUufwq8y.cjs');
+const useSignMessage = require('./shared/vue.DuI_Jm5P.cjs');
+const useSignAndSendTransaction = require('./shared/vue.BnSjOzvb.cjs');
+const useSignatureStatus = require('./shared/vue.DRlaqQCL.cjs');
 const useSolana = require('./shared/vue.C4tLiG3R.cjs');
-const useTransaction = require('./shared/vue.DQi38JeF.cjs');
-const useTransactionConfirmation = require('./shared/vue.DHVYJk8P.cjs');
-const useWallet = require('./shared/vue.BwipRa1w.cjs');
+const useTransaction = require('./shared/vue.CE5i8KZZ.cjs');
+const useTransactionConfirmation = require('./shared/vue.BeA8WQ2g.cjs');
+const useWallet = require('./shared/vue.DfeKj9vL.cjs');
 const useWallets = require('./shared/vue.P9tgeC5S.cjs');
+const errors = require('@vue-solana/core/errors');
 const rpc = require('@vue-solana/core/rpc');
+const timeout = require('@vue-solana/core/timeout');
 const walletStandard = require('@vue-solana/core/wallet-standard');
 const vue = require('vue');
 const iosWallet = require('@vue-solana/core/ios-wallet');
 require('@vue-solana/core/address');
-require('@solana/web3-compat');
 require('@vue-solana/core/wallet');
 require('@vue-solana/core/transaction');
 require('bs58');
 
 const SELECTED_WALLET_STORAGE_KEY = "vue-solana:selected-wallet";
 function readSelectedWallet() {
-  const storage = getLocalStorage();
-  if (!storage) {
-    return null;
+  const { storage, error } = getLocalStorage();
+  if (error || !storage) {
+    return { wallet: null, error };
   }
   try {
     const value = storage.getItem(SELECTED_WALLET_STORAGE_KEY);
     if (!value) {
-      return null;
+      return { wallet: null, error: null };
     }
     const wallet = JSON.parse(value);
-    return typeof wallet.name === "string" ? {
-      name: wallet.name,
-      platform: wallet.platform,
-      source: wallet.source
-    } : null;
-  } catch {
-    return null;
+    return {
+      wallet: typeof wallet.name === "string" ? {
+        name: wallet.name,
+        platform: wallet.platform,
+        source: wallet.source
+      } : null,
+      error: null
+    };
+  } catch (cause) {
+    return {
+      wallet: null,
+      error: errors.createSolanaError("STORAGE_FAILURE", "Unable to read the selected Solana wallet", {
+        cause
+      })
+    };
   }
 }
 function writeSelectedWallet(wallet) {
-  const storage = getLocalStorage();
-  if (!storage) {
-    return;
+  const { storage, error } = getLocalStorage();
+  if (error || !storage) {
+    return error;
   }
   try {
     if (wallet) {
@@ -55,7 +64,11 @@ function writeSelectedWallet(wallet) {
     } else {
       storage.removeItem(SELECTED_WALLET_STORAGE_KEY);
     }
-  } catch {
+    return null;
+  } catch (cause) {
+    return errors.createSolanaError("STORAGE_FAILURE", "Unable to persist the selected Solana wallet", {
+      cause
+    });
   }
 }
 function stringifySelectedWallet(wallet) {
@@ -70,12 +83,17 @@ function stringifySelectedWallet(wallet) {
 }
 function getLocalStorage() {
   if (typeof window === "undefined") {
-    return null;
+    return { storage: null, error: null };
   }
   try {
-    return window.localStorage;
-  } catch {
-    return null;
+    return { storage: window.localStorage, error: null };
+  } catch (cause) {
+    return {
+      storage: null,
+      error: errors.createSolanaError("STORAGE_FAILURE", "Unable to read the selected Solana wallet", {
+        cause
+      })
+    };
   }
 }
 
@@ -203,10 +221,12 @@ function createSolanaPlugin(options = {}) {
           wsEndpoint: context.wsEndpoint
         });
         try {
-          const blockhash = await useTransaction.withTimeout(
+          const blockhash = await timeout.withTimeout(
             context.connection.getLatestBlockhash(),
             RPC_CHECK_TIMEOUT_MS,
-            `RPC connection check timed out after ${RPC_CHECK_TIMEOUT_MS / 1e3} seconds.`
+            () => new Error(
+              `RPC connection check timed out after ${RPC_CHECK_TIMEOUT_MS / 1e3} seconds.`
+            )
           );
           if (checkId !== rpcCheckId) {
             return;
@@ -224,7 +244,7 @@ function createSolanaPlugin(options = {}) {
             return;
           }
           status.value = "error";
-          error.value = cause instanceof Error ? cause.message : String(cause);
+          error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
           console.error("[Vue Solana] Connection failed", cause);
         }
       }
@@ -240,7 +260,13 @@ function createSolanaPlugin(options = {}) {
           }
         } else if (!options.wallet) {
           const persistedWallet = readSelectedWallet();
-          restoredWallet = persistedWallet ? wallets.value.find((nextWallet) => isSameWallet(nextWallet, persistedWallet)) ?? null : null;
+          if (persistedWallet.error) {
+            error.value = persistedWallet.error;
+            console.error("[Vue Solana] Selected wallet restoration failed", persistedWallet.error);
+          }
+          restoredWallet = persistedWallet.wallet ? wallets.value.find(
+            (nextWallet) => isSameWallet(nextWallet, persistedWallet.wallet)
+          ) ?? null : null;
           if (restoredWallet) {
             selectedWallet.value = restoredWallet;
             wallet.value = walletRegistry.getAdaptedWallet(restoredWallet);
@@ -269,7 +295,11 @@ function createSolanaPlugin(options = {}) {
       function selectWallet(nextWallet) {
         selectedWallet.value = nextWallet;
         wallet.value = nextWallet ? walletRegistry.getAdaptedWallet(nextWallet) : options.wallet ?? null;
-        writeSelectedWallet(nextWallet);
+        const storageError = writeSelectedWallet(nextWallet);
+        if (storageError) {
+          error.value = storageError;
+          console.error("[Vue Solana] Selected wallet persistence failed", storageError);
+        }
       }
       function autoConnectWallet(walletInfo) {
         if (!options.autoConnect) {
@@ -301,7 +331,11 @@ function createSolanaPlugin(options = {}) {
         setWallet(nextWallet) {
           selectedWallet.value = null;
           wallet.value = nextWallet;
-          writeSelectedWallet(null);
+          const storageError = writeSelectedWallet(null);
+          if (storageError) {
+            error.value = storageError;
+            console.error("[Vue Solana] Selected wallet persistence failed", storageError);
+          }
         }
       };
       app.provide(useSolana.solanaInjectionKey, vueContext);

package/dist/index.d.cts

@@ -11,12 +11,13 @@ export { UseTransactionOptions, useTransaction } from './useTransaction.cjs';
 export { TransactionConfirmationStatus, getConfirmedTransactionStatus, useTransactionConfirmation } from './useTransactionConfirmation.cjs';
 export { useWallet } from './useWallet.cjs';
 export { useWallets } from './useWallets.cjs';
-export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DGhodYJh.cjs';
+export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DL3z5PxP.cjs';
 import { GetSolanaIosWalletsOptions } from '@vue-solana/core/ios-wallet';
 import { RegisterSolanaMobileWalletOptions } from '@vue-solana/core/mobile-wallet';
 import { SolanaConfig, SolanaWallet } from '@vue-solana/core/types';
 import { App } from 'vue';
 import '@vue-solana/core/address';
+import '@vue-solana/core/errors';
 import '@solana/web3-compat';
 
 interface VueSolanaPluginOptions extends SolanaConfig {

package/dist/index.d.mts

@@ -11,12 +11,13 @@ export { UseTransactionOptions, useTransaction } from './useTransaction.mjs';
 export { TransactionConfirmationStatus, getConfirmedTransactionStatus, useTransactionConfirmation } from './useTransactionConfirmation.mjs';
 export { useWallet } from './useWallet.mjs';
 export { useWallets } from './useWallets.mjs';
-export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DGhodYJh.mjs';
+export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DL3z5PxP.mjs';
 import { GetSolanaIosWalletsOptions } from '@vue-solana/core/ios-wallet';
 import { RegisterSolanaMobileWalletOptions } from '@vue-solana/core/mobile-wallet';
 import { SolanaConfig, SolanaWallet } from '@vue-solana/core/types';
 import { App } from 'vue';
 import '@vue-solana/core/address';
+import '@vue-solana/core/errors';
 import '@solana/web3-compat';
 
 interface VueSolanaPluginOptions extends SolanaConfig {

package/dist/index.d.ts

@@ -11,12 +11,13 @@ export { UseTransactionOptions, useTransaction } from './useTransaction.js';
 export { TransactionConfirmationStatus, getConfirmedTransactionStatus, useTransactionConfirmation } from './useTransactionConfirmation.js';
 export { useWallet } from './useWallet.js';
 export { useWallets } from './useWallets.js';
-export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DGhodYJh.js';
+export { S as SolanaConnectionStatus, V as VueSolanaContext, s as solanaInjectionKey } from './shared/vue.DL3z5PxP.js';
 import { GetSolanaIosWalletsOptions } from '@vue-solana/core/ios-wallet';
 import { RegisterSolanaMobileWalletOptions } from '@vue-solana/core/mobile-wallet';
 import { SolanaConfig, SolanaWallet } from '@vue-solana/core/types';
 import { App } from 'vue';
 import '@vue-solana/core/address';
+import '@vue-solana/core/errors';
 import '@solana/web3-compat';
 
 interface VueSolanaPluginOptions extends SolanaConfig {

package/dist/index.mjs

@@ -1,53 +1,61 @@
-export { u as useAccountInfo } from './shared/vue.7TzeDJZX.mjs';
-export { u as useBalance } from './shared/vue.DQhHHVu6.mjs';
+export { u as useAccountInfo } from './shared/vue.Cl3hXlXK.mjs';
+export { u as useBalance } from './shared/vue.BDl2vVkp.mjs';
 export { u as useConnection } from './shared/vue.DlEAL2G8.mjs';
-export { u as useProgramAccounts } from './shared/vue.CUTLu1Gf.mjs';
+export { u as useProgramAccounts } from './shared/vue.CzTu_DPr.mjs';
 export { u as useRpc } from './shared/vue.BqDzSepb.mjs';
-export { u as useSignMessage } from './shared/vue.BeuIPLGM.mjs';
-export { u as useSignAndSendTransaction } from './shared/vue.CM6qb_s8.mjs';
-export { u as useSignatureStatus } from './shared/vue.JC5FdU2O.mjs';
+export { u as useSignMessage } from './shared/vue.PTQ2iRAi.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.BlfFUgC-.mjs';
+export { u as useSignatureStatus } from './shared/vue.BzopW_4m.mjs';
 import { s as solanaInjectionKey } from './shared/vue.1M_c5FWA.mjs';
 export { t as tryUseSolana, u as useSolana } from './shared/vue.1M_c5FWA.mjs';
-import { w as withTimeout } from './shared/vue.gLqkzJY4.mjs';
-export { u as useTransaction } from './shared/vue.gLqkzJY4.mjs';
-export { g as getConfirmedTransactionStatus, u as useTransactionConfirmation } from './shared/vue.jOsz34kz.mjs';
-export { u as useWallet } from './shared/vue.CGVdFmYI.mjs';
+export { u as useTransaction } from './shared/vue.C4d2JA8U.mjs';
+export { g as getConfirmedTransactionStatus, u as useTransactionConfirmation } from './shared/vue.CxMrojxC.mjs';
+export { u as useWallet } from './shared/vue.5sF8eKgx.mjs';
 export { u as useWallets } from './shared/vue.h-uS8MXN.mjs';
+import { createSolanaError, normalizeSolanaError } from '@vue-solana/core/errors';
 import { createSolanaContext } from '@vue-solana/core/rpc';
+import { withTimeout } from '@vue-solana/core/timeout';
 import { getRegisteredSolanaWallets, getSolanaChain, adaptSolanaStandardWallet, subscribeSolanaWallets } from '@vue-solana/core/wallet-standard';
 import { shallowRef, ref, triggerRef } from 'vue';
 import { handleSolanaIosWalletCallback, getSolanaIosWallets, isSolanaIosWalletInfo, adaptSolanaIosWallet } from '@vue-solana/core/ios-wallet';
 import '@vue-solana/core/address';
-import '@solana/web3-compat';
 import '@vue-solana/core/wallet';
 import '@vue-solana/core/transaction';
 import 'bs58';
 
 const SELECTED_WALLET_STORAGE_KEY = "vue-solana:selected-wallet";
 function readSelectedWallet() {
-  const storage = getLocalStorage();
-  if (!storage) {
-    return null;
+  const { storage, error } = getLocalStorage();
+  if (error || !storage) {
+    return { wallet: null, error };
   }
   try {
     const value = storage.getItem(SELECTED_WALLET_STORAGE_KEY);
     if (!value) {
-      return null;
+      return { wallet: null, error: null };
     }
     const wallet = JSON.parse(value);
-    return typeof wallet.name === "string" ? {
-      name: wallet.name,
-      platform: wallet.platform,
-      source: wallet.source
-    } : null;
-  } catch {
-    return null;
+    return {
+      wallet: typeof wallet.name === "string" ? {
+        name: wallet.name,
+        platform: wallet.platform,
+        source: wallet.source
+      } : null,
+      error: null
+    };
+  } catch (cause) {
+    return {
+      wallet: null,
+      error: createSolanaError("STORAGE_FAILURE", "Unable to read the selected Solana wallet", {
+        cause
+      })
+    };
   }
 }
 function writeSelectedWallet(wallet) {
-  const storage = getLocalStorage();
-  if (!storage) {
-    return;
+  const { storage, error } = getLocalStorage();
+  if (error || !storage) {
+    return error;
   }
   try {
     if (wallet) {
@@ -55,7 +63,11 @@ function writeSelectedWallet(wallet) {
     } else {
       storage.removeItem(SELECTED_WALLET_STORAGE_KEY);
     }
-  } catch {
+    return null;
+  } catch (cause) {
+    return createSolanaError("STORAGE_FAILURE", "Unable to persist the selected Solana wallet", {
+      cause
+    });
   }
 }
 function stringifySelectedWallet(wallet) {
@@ -70,12 +82,17 @@ function stringifySelectedWallet(wallet) {
 }
 function getLocalStorage() {
   if (typeof window === "undefined") {
-    return null;
+    return { storage: null, error: null };
   }
   try {
-    return window.localStorage;
-  } catch {
-    return null;
+    return { storage: window.localStorage, error: null };
+  } catch (cause) {
+    return {
+      storage: null,
+      error: createSolanaError("STORAGE_FAILURE", "Unable to read the selected Solana wallet", {
+        cause
+      })
+    };
   }
 }
 
@@ -206,7 +223,9 @@ function createSolanaPlugin(options = {}) {
           const blockhash = await withTimeout(
             context.connection.getLatestBlockhash(),
             RPC_CHECK_TIMEOUT_MS,
-            `RPC connection check timed out after ${RPC_CHECK_TIMEOUT_MS / 1e3} seconds.`
+            () => new Error(
+              `RPC connection check timed out after ${RPC_CHECK_TIMEOUT_MS / 1e3} seconds.`
+            )
           );
           if (checkId !== rpcCheckId) {
             return;
@@ -224,7 +243,7 @@ function createSolanaPlugin(options = {}) {
             return;
           }
           status.value = "error";
-          error.value = cause instanceof Error ? cause.message : String(cause);
+          error.value = normalizeSolanaError(cause, "RPC_FAILURE");
           console.error("[Vue Solana] Connection failed", cause);
         }
       }
@@ -240,7 +259,13 @@ function createSolanaPlugin(options = {}) {
           }
         } else if (!options.wallet) {
           const persistedWallet = readSelectedWallet();
-          restoredWallet = persistedWallet ? wallets.value.find((nextWallet) => isSameWallet(nextWallet, persistedWallet)) ?? null : null;
+          if (persistedWallet.error) {
+            error.value = persistedWallet.error;
+            console.error("[Vue Solana] Selected wallet restoration failed", persistedWallet.error);
+          }
+          restoredWallet = persistedWallet.wallet ? wallets.value.find(
+            (nextWallet) => isSameWallet(nextWallet, persistedWallet.wallet)
+          ) ?? null : null;
           if (restoredWallet) {
             selectedWallet.value = restoredWallet;
             wallet.value = walletRegistry.getAdaptedWallet(restoredWallet);
@@ -269,7 +294,11 @@ function createSolanaPlugin(options = {}) {
       function selectWallet(nextWallet) {
         selectedWallet.value = nextWallet;
         wallet.value = nextWallet ? walletRegistry.getAdaptedWallet(nextWallet) : options.wallet ?? null;
-        writeSelectedWallet(nextWallet);
+        const storageError = writeSelectedWallet(nextWallet);
+        if (storageError) {
+          error.value = storageError;
+          console.error("[Vue Solana] Selected wallet persistence failed", storageError);
+        }
       }
       function autoConnectWallet(walletInfo) {
         if (!options.autoConnect) {
@@ -301,7 +330,11 @@ function createSolanaPlugin(options = {}) {
         setWallet(nextWallet) {
           selectedWallet.value = null;
           wallet.value = nextWallet;
-          writeSelectedWallet(null);
+          const storageError = writeSelectedWallet(null);
+          if (storageError) {
+            error.value = storageError;
+            console.error("[Vue Solana] Selected wallet persistence failed", storageError);
+          }
         }
       };
       app.provide(solanaInjectionKey, vueContext);

package/dist/shared/{vue.CGVdFmYI.mjs → vue.5sF8eKgx.mjs}

@@ -1,3 +1,5 @@
+import { normalizeSolanaError } from '@vue-solana/core/errors';
+import { createNoWalletSelectedError } from '@vue-solana/core/wallet';
 import { ref, computed, triggerRef } from 'vue';
 import { u as useSolana } from './vue.1M_c5FWA.mjs';
 
@@ -9,7 +11,7 @@ function useWallet() {
   async function connect() {
     const activeWallet = wallet.value;
     if (!activeWallet) {
-      throw new Error("No Solana wallet is configured");
+      throw createNoWalletSelectedError();
     }
     connecting.value = true;
     try {
@@ -21,9 +23,10 @@ function useWallet() {
         publicKey: activeWallet.publicKey?.toBase58() ?? null
       });
     } catch (error) {
+      const normalizedError = normalizeSolanaError(error, "RPC_FAILURE");
       triggerRef(wallet);
-      console.error("[Vue Solana] Wallet connection failed", error);
-      throw error;
+      console.error("[Vue Solana] Wallet connection failed", normalizedError);
+      throw normalizedError;
     } finally {
       connecting.value = false;
     }
@@ -40,9 +43,10 @@ function useWallet() {
       triggerRef(wallet);
       console.info("[Vue Solana] Wallet disconnected", { publicKey });
     } catch (error) {
+      const normalizedError = normalizeSolanaError(error, "RPC_FAILURE");
       triggerRef(wallet);
-      console.error("[Vue Solana] Wallet disconnection failed", error);
-      throw error;
+      console.error("[Vue Solana] Wallet disconnection failed", normalizedError);
+      throw normalizedError;
     } finally {
       disconnecting.value = false;
     }

package/dist/shared/{vue.BPnK_lsh.cjs → vue.BBoDTIfF.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');
@@ -38,11 +39,12 @@ function useAccountInfo(address$1, options = {}) {
       }
       return nextAccountInfo;
     } catch (cause) {
+      const normalizedError = errors.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;
@@ -63,7 +65,7 @@ function useAccountInfo(address$1, options = {}) {
     try {
       await connection.removeAccountChangeListener(currentSubscriptionId);
     } catch (cause) {
-      error.value = cause;
+      error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
     }
   }
   async function startWatching() {
@@ -98,7 +100,7 @@ function useAccountInfo(address$1, options = {}) {
       subscriptionId = nextSubscriptionId;
     } catch (cause) {
       if (requestId === watchId) {
-        error.value = cause;
+        error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       }
     }
   }

package/dist/shared/{vue.DQhHHVu6.mjs → vue.BDl2vVkp.mjs}

@@ -1,4 +1,5 @@
-import { PublicKey } from '@solana/web3-compat';
+import { parsePublicKey } from '@vue-solana/core/address';
+import { normalizeSolanaError } from '@vue-solana/core/errors';
 import { shallowRef, onMounted, watch, toValue } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
 import { t as tryUseSolana } from './vue.1M_c5FWA.mjs';
@@ -22,17 +23,22 @@ function useBalance(address, commitment) {
     loading.value = true;
     error.value = null;
     try {
-      const publicKey = typeof value === "string" ? new PublicKey(value) : value;
+      const publicKey = 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 = normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {
-        error.value = cause;
+        error.value = normalizedError;
       }
-      throw cause;
+      throw normalizedError;
     } finally {
       if (requestId === refreshId) {
         loading.value = false;

package/dist/shared/{vue.DHVYJk8P.cjs → vue.BeA8WQ2g.cjs}

@@ -1,6 +1,7 @@
 'use strict';
 
 const transaction = require('@vue-solana/core/transaction');
+const errors = require('@vue-solana/core/errors');
 const vue = require('vue');
 const useConnection = require('./vue.CwhEmATP.cjs');
 
@@ -38,11 +39,12 @@ function useTransactionConfirmation(defaultOptions = {}) {
       }
       return nextConfirmation;
     } 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;

package/dist/shared/{vue.CM6qb_s8.mjs → vue.BlfFUgC-.mjs}

@@ -1,8 +1,11 @@
+import { normalizeSolanaError } from '@vue-solana/core/errors';
+import { withSolanaTimeout } from '@vue-solana/core/timeout';
 import { signAndSendTransaction, confirmTransactionSignature } from '@vue-solana/core/transaction';
+import { createNoWalletSelectedError } from '@vue-solana/core/wallet';
 import { ref } from 'vue';
 import { u as useConnection } from './vue.DlEAL2G8.mjs';
-import { u as useWallet } from './vue.CGVdFmYI.mjs';
-import { g as getConfirmedTransactionStatus } from './vue.jOsz34kz.mjs';
+import { u as useWallet } from './vue.5sF8eKgx.mjs';
+import { g as getConfirmedTransactionStatus } from './vue.CxMrojxC.mjs';
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
 function useSignAndSendTransaction() {
@@ -24,15 +27,17 @@ function useSignAndSendTransaction() {
     confirmation.value = null;
     const activeWallet = wallet.value;
     if (!activeWallet) {
-      const cause = new Error("No Solana wallet is configured");
-      error.value = cause;
+      const normalizedError = createNoWalletSelectedError();
+      error.value = normalizedError;
       status.value = "error";
       loading.value = false;
-      throw cause;
+      throw normalizedError;
     }
     try {
-      const nextSignature = await withWalletTransactionTimeout(
-        signAndSendTransaction(connection, activeWallet, transaction, transactionOptions)
+      const nextSignature = await withSolanaTimeout(
+        signAndSendTransaction(connection, activeWallet, transaction, 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;
@@ -52,11 +57,12 @@ function useSignAndSendTransaction() {
       }
       return nextSignature;
     } 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;
@@ -72,24 +78,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);
-    }
-  }
-}
 
 export { useSignAndSendTransaction as u };