@vue-solana/vue 1.1.0 → 2.0.0

package/dist/shared/{vue.CZohWxBN.cjs → vue.C32ozdA1.cjs}

@@ -3,7 +3,7 @@
 const transaction = require('@vue-solana/core/transaction');
 const errors = require('@vue-solana/core/errors');
 const vue = require('vue');
-const useConnection = require('./vue.Bii4W61L.cjs');
+const useConnection = require('./vue.CZwftA0L.cjs');
 
 function getConfirmedTransactionStatus(confirmation) {
   if (confirmation.commitment === "finalized") {
@@ -12,7 +12,7 @@ function getConfirmedTransactionStatus(confirmation) {
   return confirmation.commitment === "processed" ? "processed" : "confirmed";
 }
 function useTransactionConfirmation(defaultOptions = {}) {
-  const connection = useConnection.useConnection();
+  const client = useConnection.useConnection();
   const signature = vue.ref(null);
   const confirmation = vue.ref(null);
   const status = vue.ref("idle");
@@ -29,7 +29,7 @@ function useTransactionConfirmation(defaultOptions = {}) {
     error.value = null;
     try {
       const nextConfirmation = await transaction.confirmTransactionSignature(
-        connection,
+        client,
         nextSignature,
         confirmationOptions
       );

package/dist/shared/{vue.BleajB0B.cjs → vue.C7yR7Cs0.cjs}

@@ -1,14 +1,15 @@
 'use strict';
 
-const address = require('@vue-solana/core/address');
 const errors = require('@vue-solana/core/errors');
 const vue = require('vue');
-const useConnection = require('./vue.Bii4W61L.cjs');
-const useSolana = require('./vue.eNXmiI3a.cjs');
+const address = require('@vue-solana/core/address');
+const useConnection = require('./vue.CZwftA0L.cjs');
+const useSolana = require('./vue.BaR1VPhl.cjs');
+const decodeBase64 = require('./vue.DNxOpDXz.cjs');
 
 function useProgramAccounts(programId, options = {}) {
   const solana = useSolana.tryUseSolana();
-  const connection = solana?.connection ?? useConnection.useConnection();
+  const client = solana?.client ?? useConnection.useConnection();
   const accounts = vue.shallowRef([]);
   const loading = vue.shallowRef(false);
   const error = vue.shallowRef(null);
@@ -25,16 +26,27 @@ function useProgramAccounts(programId, options = {}) {
     loading.value = true;
     error.value = null;
     try {
-      const publicKey = address.parsePublicKey(value);
-      if (!publicKey) {
+      const parsedAddress = address.parseAddress(value);
+      if (!parsedAddress) {
         accounts.value = [];
         return [];
       }
-      const nextAccounts = await connection.getProgramAccounts(publicKey, {
+      const { value: response } = await client.rpc.getProgramAccounts(parsedAddress, {
+        encoding: "base64",
         commitment: options.commitment,
         dataSlice: options.dataSlice,
         filters: options.filters
-      });
+      }).send();
+      const nextAccounts = response.map(({ pubkey, account }) => ({
+        pubkey,
+        account: {
+          executable: account.executable,
+          lamports: Number(account.lamports),
+          owner: account.owner,
+          space: Number(account.space),
+          data: decodeBase64.decodeBase64(account.data[0])
+        }
+      }));
       if (requestId === refreshId) {
         accounts.value = nextAccounts;
       }

package/dist/shared/{vue.D6U1RFZ0.cjs → vue.CEn2purG.cjs}

@@ -3,12 +3,12 @@
 const address = require('@vue-solana/core/address');
 const errors = require('@vue-solana/core/errors');
 const vue = require('vue');
-const useConnection = require('./vue.Bii4W61L.cjs');
-const useSolana = require('./vue.eNXmiI3a.cjs');
+const useConnection = require('./vue.CZwftA0L.cjs');
+const useSolana = require('./vue.BaR1VPhl.cjs');
 
 function useBalance(address$1, commitment) {
   const solana = useSolana.tryUseSolana();
-  const connection = solana?.connection ?? useConnection.useConnection();
+  const client = solana?.client ?? useConnection.useConnection();
   const balance = vue.shallowRef(null);
   const loading = vue.shallowRef(false);
   const error = vue.shallowRef(null);
@@ -25,16 +25,16 @@ function useBalance(address$1, commitment) {
     loading.value = true;
     error.value = null;
     try {
-      const publicKey = address.parsePublicKey(value);
-      if (!publicKey) {
+      const parsedAddress = address.parseAddress(value);
+      if (!parsedAddress) {
         balance.value = null;
         return null;
       }
-      const nextBalance = await connection.getBalance(publicKey, commitment);
+      const { value: lamports } = await client.rpc.getBalance(parsedAddress, commitment ? { commitment } : void 0).send();
       if (requestId === refreshId) {
-        balance.value = nextBalance;
+        balance.value = Number(lamports);
       }
-      return nextBalance;
+      return Number(lamports);
     } catch (cause) {
       const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
       if (requestId === refreshId) {

package/dist/shared/{vue.Dp894nYb.cjs → vue.CP1DPDX9.cjs}

@@ -3,7 +3,7 @@
 const errors = require('@vue-solana/core/errors');
 const wallet = require('@vue-solana/core/wallet');
 const vue = require('vue');
-const useWallet = require('./vue.o-mWY2Yg.cjs');
+const useWallet = require('./vue.BAlo-tIh.cjs');
 
 function useSignMessage() {
   const { wallet: wallet$1 } = useWallet.useWallet();

package/dist/shared/{vue.CMJANJ4a.cjs → vue.CSJSK0Nq.cjs}

@@ -5,13 +5,13 @@ 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.Bii4W61L.cjs');
-const useWallet = require('./vue.o-mWY2Yg.cjs');
-const useTransactionConfirmation = require('./vue.CZohWxBN.cjs');
+const useConnection = require('./vue.CZwftA0L.cjs');
+const useWallet = require('./vue.BAlo-tIh.cjs');
+const useTransactionConfirmation = require('./vue.C32ozdA1.cjs');
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
 function useSignAndSendTransaction() {
-  const connection = useConnection.useConnection();
+  const client = useConnection.useConnection();
   const { wallet: wallet$1 } = useWallet.useWallet();
   const signature = vue.ref(null);
   const confirmation = vue.ref(null);
@@ -37,7 +37,7 @@ function useSignAndSendTransaction() {
     }
     try {
       const nextSignature = await timeout.withSolanaTimeout(
-        transaction.signAndSendTransaction(connection, activeWallet, transaction$1, transactionOptions),
+        transaction.signAndSendTransaction(client, 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."
       );
@@ -49,7 +49,7 @@ function useSignAndSendTransaction() {
         return nextSignature;
       }
       const nextConfirmation = await transaction.confirmTransactionSignature(
-        connection,
+        client,
         nextSignature,
         confirmationOptions
       );

package/dist/shared/{vue.BM8Qjk74.cjs → vue.CXHYdyKZ.cjs}

@@ -1,15 +1,15 @@
 'use strict';
 
-const address = require('@vue-solana/core/address');
-const errors = require('@vue-solana/core/errors');
 const tokenAccounts = require('@vue-solana/core/token-accounts');
+const errors = require('@vue-solana/core/errors');
+const address = require('@vue-solana/core/address');
 const vue = require('vue');
-const useConnection = require('./vue.Bii4W61L.cjs');
-const useSolana = require('./vue.eNXmiI3a.cjs');
+const useConnection = require('./vue.CZwftA0L.cjs');
+const useSolana = require('./vue.BaR1VPhl.cjs');
 
-function useTokenBalance(mint, owner) {
+function useTokenBalance(mint, owner, commitment) {
   const solana = useSolana.tryUseSolana();
-  const connection = solana?.connection ?? useConnection.useConnection();
+  const client = solana?.client ?? useConnection.useConnection();
   const balance = vue.shallowRef(null);
   const decimals = vue.shallowRef(null);
   const loading = vue.shallowRef(false);
@@ -29,15 +29,15 @@ function useTokenBalance(mint, owner) {
     loading.value = true;
     error.value = null;
     try {
-      const mintKey = address.parsePublicKey(mintValue);
-      const ownerKey = address.parsePublicKey(ownerValue);
+      const mintKey = address.parseAddress(mintValue);
+      const ownerKey = address.parseAddress(ownerValue);
       if (!mintKey || !ownerKey) {
         balance.value = null;
         decimals.value = null;
         loading.value = false;
         return null;
       }
-      const nextBalance = await tokenAccounts.getTokenBalance(connection, mintKey, ownerKey);
+      const nextBalance = await tokenAccounts.getTokenBalance(client, mintKey, ownerKey, commitment);
       if (requestId === refreshId) {
         balance.value = nextBalance?.amount ?? null;
         decimals.value = nextBalance?.decimals ?? null;

package/dist/shared/{vue.vn--SX8d.mjs → vue.CZO8TwJP.mjs}

@@ -1,7 +1,7 @@
 import { normalizeSolanaError } from '@vue-solana/core/errors';
 import { createNoWalletSelectedError, assertWalletCanSignMessage } from '@vue-solana/core/wallet';
 import { ref } from 'vue';
-import { u as useWallet } from './vue.B7w1CC4R.mjs';
+import { u as useWallet } from './vue.PJjEncbP.mjs';
 
 function useSignMessage() {
   const { wallet } = useWallet();

package/dist/shared/vue.CZwftA0L.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+const useSolanaClient = require('./vue.k9Q6aN-0.cjs');
+
+function useConnection() {
+  return useSolanaClient.useSolanaClient().client;
+}
+
+exports.useConnection = useConnection;

package/dist/shared/vue.ChujsB0B.mjs

@@ -0,0 +1,7 @@
+import { u as useSolanaClient } from './vue.BaFrF2PF.mjs';
+
+function useConnection() {
+  return useSolanaClient().client;
+}
+
+export { useConnection as u };

package/dist/shared/{vue.DCDTsSjf.mjs → vue.CnUlZSe8.mjs}

@@ -16,7 +16,7 @@ function getSsrContext() {
     cluster: "devnet",
     endpoint: "",
     wsEndpoint: "",
-    connection: createUnavailableConnection(),
+    client: createUnavailableProxy(),
     wallet: shallowRef(null),
     status: ref("idle"),
     error: ref(null),
@@ -34,7 +34,7 @@ function getSsrContext() {
   };
   return ssrContext;
 }
-function createUnavailableConnection() {
+function createUnavailableProxy() {
   return new Proxy(
     {},
     {

package/dist/shared/{vue.Cvg6TEXE.mjs → vue.D7xFeC2m.mjs}

@@ -1,4 +1,4 @@
-import { u as useSolana } from './vue.DCDTsSjf.mjs';
+import { u as useSolana } from './vue.CnUlZSe8.mjs';
 
 function useWallets() {
   const solana = useSolana();

package/dist/shared/{vue.DZWyk9E_.mjs → vue.DL-yMCNc.mjs}

@@ -1,21 +1,18 @@
 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.CKx4lRew.mjs';
-import { t as tryUseSolana } from './vue.DCDTsSjf.mjs';
+import { u as useConnection } from './vue.ChujsB0B.mjs';
+import { t as tryUseSolana } from './vue.CnUlZSe8.mjs';
 
 function useSignatureStatus(signature, options = {}) {
   const solana = tryUseSolana();
-  const connection = solana?.connection ?? useConnection();
+  const client = solana?.client ?? useConnection();
   const status = shallowRef(null);
   const loading = shallowRef(false);
   const error = shallowRef(null);
   let refreshId = 0;
-  let subscriptionStartId = 0;
   let pollId = null;
-  let subscriptionId = null;
   let manuallyStoppedPolling = false;
-  let manuallyStoppedSubscription = false;
   async function refresh() {
     const requestId = ++refreshId;
     const value = toValue(signature);
@@ -29,10 +26,11 @@ function useSignatureStatus(signature, options = {}) {
     error.value = null;
     try {
       const validSignature = parseTransactionSignature(value);
-      const response = await connection.getSignatureStatuses([validSignature], {
+      const response = await client.rpc.getSignatureStatuses([validSignature], {
         searchTransactionHistory: options.searchTransactionHistory
-      });
-      const nextStatus = response.value[0] ?? null;
+      }).send();
+      const nextRawStatus = response.value[0] ?? null;
+      const nextStatus = nextRawStatus ? normalizeSignatureStatus(nextRawStatus) : null;
       if (requestId === refreshId) {
         status.value = nextStatus;
       }
@@ -81,80 +79,19 @@ function useSignatureStatus(signature, options = {}) {
       void refresh().catch(() => void 0);
     }, options.pollIntervalMs);
   }
-  async function stopSubscription() {
-    manuallyStoppedSubscription = true;
-    subscriptionStartId += 1;
-    await stopCurrentSubscription();
-  }
-  async function stopCurrentSubscription() {
-    if (subscriptionId === null) {
-      return;
-    }
-    const currentSubscriptionId = subscriptionId;
-    subscriptionId = null;
-    try {
-      await connection.removeSignatureListener(currentSubscriptionId);
-    } catch (cause) {
-      error.value = normalizeSolanaError(cause, "RPC_FAILURE");
-    }
-  }
-  async function startSubscription() {
-    const requestId = ++subscriptionStartId;
-    await stopCurrentSubscription();
-    if (requestId !== subscriptionStartId) {
-      return;
-    }
-    const value = toValue(signature);
-    if (manuallyStoppedSubscription || !options.subscribe || !value || !solana) {
-      return;
-    }
-    try {
-      const validSignature = parseTransactionSignature(value);
-      const nextSubscriptionId = connection.onSignature(
-        validSignature,
-        (notification, context) => {
-          if (requestId !== subscriptionStartId) {
-            return;
-          }
-          status.value = {
-            slot: context.slot,
-            confirmations: null,
-            err: notification.err,
-            confirmationStatus: options.commitment ?? "confirmed"
-          };
-          error.value = null;
-        },
-        options.commitment
-      );
-      if (requestId !== subscriptionStartId) {
-        await connection.removeSignatureListener(nextSubscriptionId);
-        return;
-      }
-      subscriptionId = nextSubscriptionId;
-    } catch (cause) {
-      if (requestId === subscriptionStartId) {
-        error.value = normalizeSolanaError(cause, "RPC_FAILURE");
-      }
-    }
-  }
-  function resetIntervals() {
-    startPolling();
-    void startSubscription();
-  }
   onMounted(() => {
     void refresh().catch(() => void 0);
-    resetIntervals();
+    startPolling();
   });
   onUnmounted(() => {
     refreshId += 1;
     stopPolling();
-    void stopSubscription();
   });
   watch(
     () => toValue(signature),
     () => {
       void refresh().catch(() => void 0);
-      resetIntervals();
+      startPolling();
     }
   );
   return {
@@ -162,8 +99,7 @@ function useSignatureStatus(signature, options = {}) {
     loading,
     error,
     refresh,
-    stopPolling,
-    stopSubscription
+    stopPolling
   };
 }
 function parseTransactionSignature(signature) {
@@ -178,5 +114,13 @@ function parseTransactionSignature(signature) {
   }
   return signature;
 }
+function normalizeSignatureStatus(status) {
+  return {
+    slot: Number(status.slot),
+    confirmations: status.confirmations === null ? null : Number(status.confirmations),
+    err: status.err,
+    confirmationStatus: status.confirmationStatus
+  };
+}
 
 export { useSignatureStatus as u };

package/dist/shared/vue.DNxOpDXz.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+function decodeBase64(value) {
+  const binary = atob(value);
+  const bytes = new Uint8Array(binary.length);
+  for (let index = 0; index < binary.length; index += 1) {
+    bytes[index] = binary.charCodeAt(index);
+  }
+  return bytes;
+}
+
+exports.decodeBase64 = decodeBase64;

package/dist/shared/{vue.BPuN7ieB.mjs → vue.DP7qY8Rk.mjs}

@@ -1,13 +1,13 @@
-import { parsePublicKey } from '@vue-solana/core/address';
-import { normalizeSolanaError } from '@vue-solana/core/errors';
 import { getTokenBalance } from '@vue-solana/core/token-accounts';
+import { normalizeSolanaError } from '@vue-solana/core/errors';
+import { parseAddress } from '@vue-solana/core/address';
 import { shallowRef, onMounted, watch, toValue } from 'vue';
-import { u as useConnection } from './vue.CKx4lRew.mjs';
-import { t as tryUseSolana } from './vue.DCDTsSjf.mjs';
+import { u as useConnection } from './vue.ChujsB0B.mjs';
+import { t as tryUseSolana } from './vue.CnUlZSe8.mjs';
 
-function useTokenBalance(mint, owner) {
+function useTokenBalance(mint, owner, commitment) {
   const solana = tryUseSolana();
-  const connection = solana?.connection ?? useConnection();
+  const client = solana?.client ?? useConnection();
   const balance = shallowRef(null);
   const decimals = shallowRef(null);
   const loading = shallowRef(false);
@@ -27,15 +27,15 @@ function useTokenBalance(mint, owner) {
     loading.value = true;
     error.value = null;
     try {
-      const mintKey = parsePublicKey(mintValue);
-      const ownerKey = parsePublicKey(ownerValue);
+      const mintKey = parseAddress(mintValue);
+      const ownerKey = parseAddress(ownerValue);
       if (!mintKey || !ownerKey) {
         balance.value = null;
         decimals.value = null;
         loading.value = false;
         return null;
       }
-      const nextBalance = await getTokenBalance(connection, mintKey, ownerKey);
+      const nextBalance = await getTokenBalance(client, mintKey, ownerKey, commitment);
       if (requestId === refreshId) {
         balance.value = nextBalance?.amount ?? null;
         decimals.value = nextBalance?.decimals ?? null;

package/dist/shared/{vue.D5Kmwcx3.cjs → vue.DgCmU1RR.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-const useSolana = require('./vue.eNXmiI3a.cjs');
+const useSolana = require('./vue.BaR1VPhl.cjs');
 
 function useWallets() {
   const solana = useSolana.useSolana();

package/dist/shared/{vue.B7w1CC4R.mjs → vue.PJjEncbP.mjs}

@@ -1,7 +1,7 @@
 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.DCDTsSjf.mjs';
+import { u as useSolana } from './vue.CnUlZSe8.mjs';
 
 function useWallet() {
   const solana = useSolana();
@@ -20,7 +20,7 @@ function useWallet() {
       await connection;
       triggerRef(wallet);
       console.info("[Vue Solana] Wallet connected", {
-        publicKey: activeWallet.publicKey?.toBase58() ?? null
+        publicKey: activeWallet.publicKey ?? null
       });
     } catch (error) {
       const normalizedError = normalizeSolanaError(error, "RPC_FAILURE");
@@ -36,7 +36,7 @@ function useWallet() {
     if (!activeWallet) {
       return;
     }
-    const publicKey = activeWallet.publicKey?.toBase58() ?? null;
+    const publicKey = activeWallet.publicKey ?? null;
     disconnecting.value = true;
     try {
       await activeWallet.disconnect();

package/dist/shared/{vue.BBNHeOeb.mjs → vue.WugzPOca.mjs}

@@ -3,13 +3,13 @@ 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.CKx4lRew.mjs';
-import { u as useWallet } from './vue.B7w1CC4R.mjs';
-import { g as getConfirmedTransactionStatus } from './vue.DaoqgzJC.mjs';
+import { u as useConnection } from './vue.ChujsB0B.mjs';
+import { u as useWallet } from './vue.PJjEncbP.mjs';
+import { g as getConfirmedTransactionStatus } from './vue.B2sFJ1xI.mjs';
 
 const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
 function useSignAndSendTransaction() {
-  const connection = useConnection();
+  const client = useConnection();
   const { wallet } = useWallet();
   const signature = ref(null);
   const confirmation = ref(null);
@@ -35,7 +35,7 @@ function useSignAndSendTransaction() {
     }
     try {
       const nextSignature = await withSolanaTimeout(
-        signAndSendTransaction(connection, activeWallet, transaction, transactionOptions),
+        signAndSendTransaction(client, activeWallet, transaction, transactionOptions),
         SIGN_AND_SEND_TIMEOUT_MS,
         "Wallet transaction did not return a result. Check your wallet or explorer for the final status."
       );
@@ -47,7 +47,7 @@ function useSignAndSendTransaction() {
         return nextSignature;
       }
       const nextConfirmation = await confirmTransactionSignature(
-        connection,
+        client,
         nextSignature,
         confirmationOptions
       );