@vue-solana/vue 0.4.2 → 0.6.0

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

@@ -1,5 +1,24 @@
 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);
@@ -37,21 +56,5 @@ function useTransaction(handler, options = {}) {
     execute
   };
 }
-function withTimeout(promise, timeoutMs, message) {
-  if (!timeoutMs) {
-    return promise;
-  }
-  let timeoutId;
-  const timeout = new Promise((_, reject) => {
-    timeoutId = setTimeout(() => {
-      reject(new Error(message));
-    }, timeoutMs);
-  });
-  return Promise.race([promise, timeout]).finally(() => {
-    if (timeoutId) {
-      clearTimeout(timeoutId);
-    }
-  });
-}
 
-export { useTransaction as u };
+export { useTransaction as u, withTimeout as w };

package/dist/shared/vue.jOsz34kz.mjs

@@ -0,0 +1,69 @@
+import { confirmTransactionSignature } from '@vue-solana/core/transaction';
+import { ref } from 'vue';
+import { u as useConnection } from './vue.DlEAL2G8.mjs';
+
+function getConfirmedTransactionStatus(confirmation) {
+  if (confirmation.commitment === "finalized") {
+    return "finalized";
+  }
+  return confirmation.commitment === "processed" ? "processed" : "confirmed";
+}
+function useTransactionConfirmation(defaultOptions = {}) {
+  const connection = useConnection();
+  const signature = ref(null);
+  const confirmation = ref(null);
+  const status = ref("idle");
+  const loading = ref(false);
+  const error = ref(null);
+  let executionId = 0;
+  async function confirm(nextSignature, options = {}) {
+    const currentExecutionId = ++executionId;
+    const confirmationOptions = { ...defaultOptions, ...options };
+    signature.value = nextSignature;
+    confirmation.value = null;
+    status.value = "confirming";
+    loading.value = true;
+    error.value = null;
+    try {
+      const nextConfirmation = await confirmTransactionSignature(
+        connection,
+        nextSignature,
+        confirmationOptions
+      );
+      if (currentExecutionId === executionId) {
+        confirmation.value = nextConfirmation;
+        status.value = getConfirmedTransactionStatus(nextConfirmation);
+      }
+      return nextConfirmation;
+    } catch (cause) {
+      if (currentExecutionId === executionId) {
+        error.value = cause;
+        status.value = "error";
+      }
+      throw cause;
+    } finally {
+      if (currentExecutionId === executionId) {
+        loading.value = false;
+      }
+    }
+  }
+  function reset() {
+    executionId += 1;
+    signature.value = null;
+    confirmation.value = null;
+    status.value = "idle";
+    loading.value = false;
+    error.value = null;
+  }
+  return {
+    signature,
+    confirmation,
+    status,
+    loading,
+    error,
+    confirm,
+    reset
+  };
+}
+
+export { getConfirmedTransactionStatus as g, useTransactionConfirmation as u };

package/dist/useSignAndSendTransaction.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
-const useSignAndSendTransaction = require('./shared/vue.BwrQMPty.cjs');
+const useSignAndSendTransaction = require('./shared/vue.DEQJ23UM.cjs');
 require('@vue-solana/core/transaction');
+require('vue');
 require('./shared/vue.CwhEmATP.cjs');
 require('./shared/vue.COyyrsQU.cjs');
-require('vue');
 require('./shared/vue.C4tLiG3R.cjs');
 require('./shared/vue.CwPjPFN6.cjs');
-require('./shared/vue.CNhelr8H.cjs');
+require('./shared/vue.DHVYJk8P.cjs');
 
 
 

package/dist/useSignAndSendTransaction.d.cts

@@ -1,11 +1,28 @@
 import * as vue from 'vue';
-import { SendTransactionOptions } from '@vue-solana/core/types';
+import { SendTransactionOptions, ConfirmTransactionOptions, TransactionConfirmation, SolanaTransaction } from '@vue-solana/core/types';
+import { TransactionSignature } from '@solana/web3-compat';
 
+type SignAndSendTransactionStatus = "idle" | "sending" | "sent" | "confirming" | "processed" | "confirmed" | "finalized" | "error";
+interface SignAndSendTransactionOptions extends SendTransactionOptions {
+    confirm?: boolean;
+    confirmation?: ConfirmTransactionOptions;
+}
 declare function useSignAndSendTransaction(): {
     signature: any;
+    confirmation: vue.Ref<{
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null, TransactionConfirmation | {
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null>;
+    status: vue.Ref<SignAndSendTransactionStatus, SignAndSendTransactionStatus>;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<TransactionSignature>;
+    execute: (transaction: SolanaTransaction, options?: SignAndSendTransactionOptions) => Promise<TransactionSignature>;
 };
 
 export { useSignAndSendTransaction };
+export type { SignAndSendTransactionOptions, SignAndSendTransactionStatus };

package/dist/useSignAndSendTransaction.d.mts

@@ -1,11 +1,28 @@
 import * as vue from 'vue';
-import { SendTransactionOptions } from '@vue-solana/core/types';
+import { SendTransactionOptions, ConfirmTransactionOptions, TransactionConfirmation, SolanaTransaction } from '@vue-solana/core/types';
+import { TransactionSignature } from '@solana/web3-compat';
 
+type SignAndSendTransactionStatus = "idle" | "sending" | "sent" | "confirming" | "processed" | "confirmed" | "finalized" | "error";
+interface SignAndSendTransactionOptions extends SendTransactionOptions {
+    confirm?: boolean;
+    confirmation?: ConfirmTransactionOptions;
+}
 declare function useSignAndSendTransaction(): {
     signature: any;
+    confirmation: vue.Ref<{
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null, TransactionConfirmation | {
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null>;
+    status: vue.Ref<SignAndSendTransactionStatus, SignAndSendTransactionStatus>;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<TransactionSignature>;
+    execute: (transaction: SolanaTransaction, options?: SignAndSendTransactionOptions) => Promise<TransactionSignature>;
 };
 
 export { useSignAndSendTransaction };
+export type { SignAndSendTransactionOptions, SignAndSendTransactionStatus };

package/dist/useSignAndSendTransaction.d.ts

@@ -1,11 +1,28 @@
 import * as vue from 'vue';
-import { SendTransactionOptions } from '@vue-solana/core/types';
+import { SendTransactionOptions, ConfirmTransactionOptions, TransactionConfirmation, SolanaTransaction } from '@vue-solana/core/types';
+import { TransactionSignature } from '@solana/web3-compat';
 
+type SignAndSendTransactionStatus = "idle" | "sending" | "sent" | "confirming" | "processed" | "confirmed" | "finalized" | "error";
+interface SignAndSendTransactionOptions extends SendTransactionOptions {
+    confirm?: boolean;
+    confirmation?: ConfirmTransactionOptions;
+}
 declare function useSignAndSendTransaction(): {
     signature: any;
+    confirmation: vue.Ref<{
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null, TransactionConfirmation | {
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null>;
+    status: vue.Ref<SignAndSendTransactionStatus, SignAndSendTransactionStatus>;
     loading: vue.Ref<boolean, boolean>;
     error: vue.Ref<unknown, unknown>;
-    execute: (transaction: any, options?: SendTransactionOptions | undefined) => Promise<TransactionSignature>;
+    execute: (transaction: SolanaTransaction, options?: SignAndSendTransactionOptions) => Promise<TransactionSignature>;
 };
 
 export { useSignAndSendTransaction };
+export type { SignAndSendTransactionOptions, SignAndSendTransactionStatus };

package/dist/useSignAndSendTransaction.mjs

@@ -1,8 +1,8 @@
-export { u as useSignAndSendTransaction } from './shared/vue.BfF-kOvb.mjs';
+export { u as useSignAndSendTransaction } from './shared/vue.RQ9fETnm.mjs';
 import '@vue-solana/core/transaction';
+import 'vue';
 import './shared/vue.DlEAL2G8.mjs';
 import './shared/vue.BqDzSepb.mjs';
-import 'vue';
 import './shared/vue.1M_c5FWA.mjs';
 import './shared/vue.DYf_CRDv.mjs';
-import './shared/vue.CuhLIeDx.mjs';
+import './shared/vue.jOsz34kz.mjs';

package/dist/useTransaction.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const useTransaction = require('./shared/vue.CNhelr8H.cjs');
+const useTransaction = require('./shared/vue.DQi38JeF.cjs');
 require('vue');
 
 

package/dist/useTransaction.mjs

@@ -1,2 +1,2 @@
-export { u as useTransaction } from './shared/vue.CuhLIeDx.mjs';
+export { u as useTransaction } from './shared/vue.gLqkzJY4.mjs';
 import 'vue';

package/dist/useTransactionConfirmation.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+const useTransactionConfirmation = require('./shared/vue.DHVYJk8P.cjs');
+require('@vue-solana/core/transaction');
+require('vue');
+require('./shared/vue.CwhEmATP.cjs');
+require('./shared/vue.COyyrsQU.cjs');
+require('./shared/vue.C4tLiG3R.cjs');
+
+
+
+exports.getConfirmedTransactionStatus = useTransactionConfirmation.getConfirmedTransactionStatus;
+exports.useTransactionConfirmation = useTransactionConfirmation.useTransactionConfirmation;

package/dist/useTransactionConfirmation.d.cts

@@ -0,0 +1,26 @@
+import * as vue from 'vue';
+import { TransactionConfirmation, ConfirmTransactionOptions } from '@vue-solana/core/types';
+import { TransactionSignature } from '@solana/web3-compat';
+
+type TransactionConfirmationStatus = "idle" | "confirming" | "processed" | "confirmed" | "finalized" | "error";
+declare function getConfirmedTransactionStatus(confirmation: TransactionConfirmation): Extract<TransactionConfirmationStatus, "processed" | "confirmed" | "finalized">;
+declare function useTransactionConfirmation(defaultOptions?: ConfirmTransactionOptions): {
+    signature: any;
+    confirmation: vue.Ref<{
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null, TransactionConfirmation | {
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null>;
+    status: vue.Ref<TransactionConfirmationStatus, TransactionConfirmationStatus>;
+    loading: vue.Ref<boolean, boolean>;
+    error: vue.Ref<unknown, unknown>;
+    confirm: (nextSignature: TransactionSignature, options?: ConfirmTransactionOptions) => Promise<TransactionConfirmation>;
+    reset: () => void;
+};
+
+export { getConfirmedTransactionStatus, useTransactionConfirmation };
+export type { TransactionConfirmationStatus };

package/dist/useTransactionConfirmation.d.mts

@@ -0,0 +1,26 @@
+import * as vue from 'vue';
+import { TransactionConfirmation, ConfirmTransactionOptions } from '@vue-solana/core/types';
+import { TransactionSignature } from '@solana/web3-compat';
+
+type TransactionConfirmationStatus = "idle" | "confirming" | "processed" | "confirmed" | "finalized" | "error";
+declare function getConfirmedTransactionStatus(confirmation: TransactionConfirmation): Extract<TransactionConfirmationStatus, "processed" | "confirmed" | "finalized">;
+declare function useTransactionConfirmation(defaultOptions?: ConfirmTransactionOptions): {
+    signature: any;
+    confirmation: vue.Ref<{
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null, TransactionConfirmation | {
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null>;
+    status: vue.Ref<TransactionConfirmationStatus, TransactionConfirmationStatus>;
+    loading: vue.Ref<boolean, boolean>;
+    error: vue.Ref<unknown, unknown>;
+    confirm: (nextSignature: TransactionSignature, options?: ConfirmTransactionOptions) => Promise<TransactionConfirmation>;
+    reset: () => void;
+};
+
+export { getConfirmedTransactionStatus, useTransactionConfirmation };
+export type { TransactionConfirmationStatus };

package/dist/useTransactionConfirmation.d.ts

@@ -0,0 +1,26 @@
+import * as vue from 'vue';
+import { TransactionConfirmation, ConfirmTransactionOptions } from '@vue-solana/core/types';
+import { TransactionSignature } from '@solana/web3-compat';
+
+type TransactionConfirmationStatus = "idle" | "confirming" | "processed" | "confirmed" | "finalized" | "error";
+declare function getConfirmedTransactionStatus(confirmation: TransactionConfirmation): Extract<TransactionConfirmationStatus, "processed" | "confirmed" | "finalized">;
+declare function useTransactionConfirmation(defaultOptions?: ConfirmTransactionOptions): {
+    signature: any;
+    confirmation: vue.Ref<{
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null, TransactionConfirmation | {
+        signature: TransactionSignature;
+        commitment: TransactionSignature;
+        result: TransactionSignature<TransactionSignature>;
+    } | null>;
+    status: vue.Ref<TransactionConfirmationStatus, TransactionConfirmationStatus>;
+    loading: vue.Ref<boolean, boolean>;
+    error: vue.Ref<unknown, unknown>;
+    confirm: (nextSignature: TransactionSignature, options?: ConfirmTransactionOptions) => Promise<TransactionConfirmation>;
+    reset: () => void;
+};
+
+export { getConfirmedTransactionStatus, useTransactionConfirmation };
+export type { TransactionConfirmationStatus };

package/dist/useTransactionConfirmation.mjs

@@ -0,0 +1,6 @@
+export { g as getConfirmedTransactionStatus, u as useTransactionConfirmation } from './shared/vue.jOsz34kz.mjs';
+import '@vue-solana/core/transaction';
+import 'vue';
+import './shared/vue.DlEAL2G8.mjs';
+import './shared/vue.BqDzSepb.mjs';
+import './shared/vue.1M_c5FWA.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-solana/vue",
-  "version": "0.4.2",
+  "version": "0.6.0",
   "description": "Vue plugin and composables for Solana applications.",
   "license": "MIT",
   "keywords": [
@@ -65,6 +65,11 @@
       "import": "./dist/useTransaction.mjs",
       "require": "./dist/useTransaction.cjs"
     },
+    "./useTransactionConfirmation": {
+      "types": "./dist/useTransactionConfirmation.d.ts",
+      "import": "./dist/useTransactionConfirmation.mjs",
+      "require": "./dist/useTransactionConfirmation.cjs"
+    },
     "./useSignAndSendTransaction": {
       "types": "./dist/useSignAndSendTransaction.d.ts",
       "import": "./dist/useSignAndSendTransaction.mjs",
@@ -78,7 +83,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue-solana/core": "0.4.2"
+    "@vue-solana/core": "0.5.0"
   },
   "peerDependencies": {
     "@solana/web3-compat": "^0.0.21",

package/dist/shared/vue.BfF-kOvb.mjs

@@ -1,24 +0,0 @@
-import { signAndSendTransaction } from '@vue-solana/core/transaction';
-import { u as useConnection } from './vue.DlEAL2G8.mjs';
-import { u as useWallet } from './vue.DYf_CRDv.mjs';
-import { u as useTransaction } from './vue.CuhLIeDx.mjs';
-
-const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
-function useSignAndSendTransaction() {
-  const connection = useConnection();
-  const { wallet } = useWallet();
-  return useTransaction(
-    (transaction, options) => {
-      if (!wallet.value) {
-        return Promise.reject(new Error("No Solana wallet is configured"));
-      }
-      return signAndSendTransaction(connection, wallet.value, transaction, options);
-    },
-    {
-      timeoutMs: SIGN_AND_SEND_TIMEOUT_MS,
-      timeoutMessage: "Wallet transaction did not return a result. Check your wallet or explorer for the final status."
-    }
-  );
-}
-
-export { useSignAndSendTransaction as u };

package/dist/shared/vue.BwrQMPty.cjs

@@ -1,26 +0,0 @@
-'use strict';
-
-const transaction = require('@vue-solana/core/transaction');
-const useConnection = require('./vue.CwhEmATP.cjs');
-const useWallet = require('./vue.CwPjPFN6.cjs');
-const useTransaction = require('./vue.CNhelr8H.cjs');
-
-const SIGN_AND_SEND_TIMEOUT_MS = 12e4;
-function useSignAndSendTransaction() {
-  const connection = useConnection.useConnection();
-  const { wallet } = useWallet.useWallet();
-  return useTransaction.useTransaction(
-    (transaction$1, options) => {
-      if (!wallet.value) {
-        return Promise.reject(new Error("No Solana wallet is configured"));
-      }
-      return transaction.signAndSendTransaction(connection, wallet.value, transaction$1, options);
-    },
-    {
-      timeoutMs: SIGN_AND_SEND_TIMEOUT_MS,
-      timeoutMessage: "Wallet transaction did not return a result. Check your wallet or explorer for the final status."
-    }
-  );
-}
-
-exports.useSignAndSendTransaction = useSignAndSendTransaction;