@vue-solana/core 0.3.0 → 0.3.2

package/README.md

@@ -95,7 +95,7 @@ Direct subpaths:
 - `isWalletConnected(wallet)`: checks whether a wallet is connected and has a public key.
 - `assertWalletConnected(wallet)`: throws if the wallet is not connected.
 - `assertWalletCanSign(wallet)`: throws if the wallet cannot sign transactions.
-- `signAndSendTransaction(connection, wallet, transaction, options?)`: signs and sends a transaction using a configured wallet.
+- `signAndSendTransaction(connection, wallet, transaction, options?)`: signs and sends a transaction using a configured wallet. Android Mobile Wallet Adapter wallets prefer `signTransaction` plus app-side RPC submission when available so the app can reliably return the submitted signature.
 
 ## Wallet Interface
 

package/dist/index.cjs

@@ -28,6 +28,7 @@ exports.signAndSendTransaction = transaction.signAndSendTransaction;
 exports.assertWalletCanSign = wallet.assertWalletCanSign;
 exports.assertWalletConnected = wallet.assertWalletConnected;
 exports.isWalletConnected = wallet.isWalletConnected;
+exports.SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = walletStandard.SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME;
 exports.adaptSolanaStandardWallet = walletStandard.adaptSolanaStandardWallet;
 exports.getRegisteredSolanaWallets = walletStandard.getRegisteredSolanaWallets;
 exports.getSolanaChain = walletStandard.getSolanaChain;

package/dist/index.d.cts

@@ -4,6 +4,6 @@ export { createSolanaConnection, createSolanaContext } from './rpc.cjs';
 export { signAndSendTransaction } from './transaction.cjs';
 export { SendTransactionOptions, SolanaChain, SolanaCluster, SolanaConfig, SolanaContext, SolanaTransaction, SolanaWallet, SolanaWalletInfo } from './types.cjs';
 export { assertWalletCanSign, assertWalletConnected, isWalletConnected } from './wallet.cjs';
-export { AdaptSolanaWalletOptions, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.cjs';
+export { AdaptSolanaWalletOptions, SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.cjs';
 import '@solana/web3-compat';
 import '@wallet-standard/base';

package/dist/index.d.mts

@@ -4,6 +4,6 @@ export { createSolanaConnection, createSolanaContext } from './rpc.mjs';
 export { signAndSendTransaction } from './transaction.mjs';
 export { SendTransactionOptions, SolanaChain, SolanaCluster, SolanaConfig, SolanaContext, SolanaTransaction, SolanaWallet, SolanaWalletInfo } from './types.mjs';
 export { assertWalletCanSign, assertWalletConnected, isWalletConnected } from './wallet.mjs';
-export { AdaptSolanaWalletOptions, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.mjs';
+export { AdaptSolanaWalletOptions, SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.mjs';
 import '@solana/web3-compat';
 import '@wallet-standard/base';

package/dist/index.d.ts

@@ -4,6 +4,6 @@ export { createSolanaConnection, createSolanaContext } from './rpc.js';
 export { signAndSendTransaction } from './transaction.js';
 export { SendTransactionOptions, SolanaChain, SolanaCluster, SolanaConfig, SolanaContext, SolanaTransaction, SolanaWallet, SolanaWalletInfo } from './types.js';
 export { assertWalletCanSign, assertWalletConnected, isWalletConnected } from './wallet.js';
-export { AdaptSolanaWalletOptions, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.js';
+export { AdaptSolanaWalletOptions, SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.js';
 import '@solana/web3-compat';
 import '@wallet-standard/base';

package/dist/index.mjs

@@ -3,7 +3,7 @@ export { getDefaultMobileWalletAppIdentity, isSolanaMobileWalletSupported, regis
 export { createSolanaConnection, createSolanaContext } from './rpc.mjs';
 export { signAndSendTransaction } from './transaction.mjs';
 export { assertWalletCanSign, assertWalletConnected, isWalletConnected } from './wallet.mjs';
-export { adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.mjs';
+export { SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets } from './wallet-standard.mjs';
 import '@solana-mobile/wallet-standard-mobile';
 import '@solana/web3-compat';
 import '@wallet-standard/app';

package/dist/transaction.cjs

@@ -4,14 +4,24 @@ const wallet = require('./wallet.cjs');
 
 async function signAndSendTransaction(connection, wallet$1, transaction, options) {
   wallet.assertWalletConnected(wallet$1);
+  if (isMobileWalletAdapterWallet(wallet$1) && wallet$1.signTransaction) {
+    wallet.assertWalletCanSign(wallet$1);
+    return signAndSendRawTransaction(connection, wallet$1, transaction, options);
+  }
   if (wallet$1.signAndSendTransaction) {
     const result = await wallet$1.signAndSendTransaction(transaction, options);
     return result.signature;
   }
   wallet.assertWalletCanSign(wallet$1);
-  const signedTransaction = await wallet$1.signTransaction(transaction);
+  return signAndSendRawTransaction(connection, wallet$1, transaction, options);
+}
+async function signAndSendRawTransaction(connection, wallet, transaction, options) {
+  const signedTransaction = await wallet.signTransaction(transaction);
   const rawTransaction = signedTransaction.serialize();
   return connection.sendRawTransaction(rawTransaction, options);
 }
+function isMobileWalletAdapterWallet(wallet) {
+  return wallet.source === "mobile-wallet-adapter";
+}
 
 exports.signAndSendTransaction = signAndSendTransaction;

package/dist/transaction.mjs

@@ -2,14 +2,24 @@ import { assertWalletConnected, assertWalletCanSign } from './wallet.mjs';
 
 async function signAndSendTransaction(connection, wallet, transaction, options) {
   assertWalletConnected(wallet);
+  if (isMobileWalletAdapterWallet(wallet) && wallet.signTransaction) {
+    assertWalletCanSign(wallet);
+    return signAndSendRawTransaction(connection, wallet, transaction, options);
+  }
   if (wallet.signAndSendTransaction) {
     const result = await wallet.signAndSendTransaction(transaction, options);
     return result.signature;
   }
   assertWalletCanSign(wallet);
+  return signAndSendRawTransaction(connection, wallet, transaction, options);
+}
+async function signAndSendRawTransaction(connection, wallet, transaction, options) {
   const signedTransaction = await wallet.signTransaction(transaction);
   const rawTransaction = signedTransaction.serialize();
   return connection.sendRawTransaction(rawTransaction, options);
 }
+function isMobileWalletAdapterWallet(wallet) {
+  return wallet.source === "mobile-wallet-adapter";
+}
 
 export { signAndSendTransaction };

package/dist/types.d.cts

@@ -21,6 +21,8 @@ interface SolanaWallet {
     connected: boolean;
     connecting?: boolean;
     disconnecting?: boolean;
+    platform?: SolanaWalletInfo["platform"];
+    source?: SolanaWalletInfo["source"];
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     signTransaction?: <T extends SolanaTransaction>(transaction: T) => Promise<T>;

package/dist/types.d.mts

@@ -21,6 +21,8 @@ interface SolanaWallet {
     connected: boolean;
     connecting?: boolean;
     disconnecting?: boolean;
+    platform?: SolanaWalletInfo["platform"];
+    source?: SolanaWalletInfo["source"];
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     signTransaction?: <T extends SolanaTransaction>(transaction: T) => Promise<T>;

package/dist/types.d.ts

@@ -21,6 +21,8 @@ interface SolanaWallet {
     connected: boolean;
     connecting?: boolean;
     disconnecting?: boolean;
+    platform?: SolanaWalletInfo["platform"];
+    source?: SolanaWalletInfo["source"];
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     signTransaction?: <T extends SolanaTransaction>(transaction: T) => Promise<T>;

package/dist/wallet-standard.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 const app = require('@wallet-standard/app');
-const walletStandardMobile = require('@solana-mobile/wallet-standard-mobile');
 const features = require('@wallet-standard/features');
 const walletStandardFeatures = require('@solana/wallet-standard-features');
 const web3Compat = require('@solana/web3-compat');
@@ -17,6 +16,7 @@ const SOLANA_CHAINS = [
   "solana:devnet",
   "solana:localnet"
 ];
+const SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = "Mobile Wallet Adapter";
 function getSolanaChain(cluster) {
   if (cluster === "mainnet-beta") {
     return "solana:mainnet";
@@ -62,6 +62,8 @@ function adaptSolanaStandardWallet(walletInfo, options = {}) {
     }
   });
   return {
+    platform: walletInfo.platform,
+    source: walletInfo.source,
     get publicKey() {
       return account ? new web3Compat.PublicKey(account.publicKey) : null;
     },
@@ -154,7 +156,7 @@ function adaptSolanaStandardWallet(walletInfo, options = {}) {
   };
 }
 function createSolanaWalletInfo(wallet) {
-  const isMobileWallet = wallet.name === walletStandardMobile.SolanaMobileWalletAdapterWalletName;
+  const isMobileWallet = wallet.name === SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME;
   return {
     name: wallet.name,
     icon: wallet.icon,
@@ -214,6 +216,7 @@ function deserializeTransaction(source, bytes) {
   return web3Compat.VersionedTransaction.deserialize(bytes);
 }
 
+exports.SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME;
 exports.adaptSolanaStandardWallet = adaptSolanaStandardWallet;
 exports.getRegisteredSolanaWallets = getRegisteredSolanaWallets;
 exports.getSolanaChain = getSolanaChain;

package/dist/wallet-standard.d.cts

@@ -2,6 +2,7 @@ import { WalletAccount, Wallet } from '@wallet-standard/base';
 import { SolanaChain, SolanaWalletInfo, SolanaWallet, SolanaCluster } from './types.cjs';
 import '@solana/web3-compat';
 
+declare const SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = "Mobile Wallet Adapter";
 interface AdaptSolanaWalletOptions {
     chain?: SolanaChain;
     account?: WalletAccount;
@@ -13,5 +14,5 @@ declare function getRegisteredSolanaWallets(): SolanaWalletInfo[];
 declare function subscribeSolanaWallets(listener: () => void): () => void;
 declare function adaptSolanaStandardWallet(walletInfo: SolanaWalletInfo, options?: AdaptSolanaWalletOptions): SolanaWallet;
 
-export { adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };
+export { SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };
 export type { AdaptSolanaWalletOptions };

package/dist/wallet-standard.d.mts

@@ -2,6 +2,7 @@ import { WalletAccount, Wallet } from '@wallet-standard/base';
 import { SolanaChain, SolanaWalletInfo, SolanaWallet, SolanaCluster } from './types.mjs';
 import '@solana/web3-compat';
 
+declare const SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = "Mobile Wallet Adapter";
 interface AdaptSolanaWalletOptions {
     chain?: SolanaChain;
     account?: WalletAccount;
@@ -13,5 +14,5 @@ declare function getRegisteredSolanaWallets(): SolanaWalletInfo[];
 declare function subscribeSolanaWallets(listener: () => void): () => void;
 declare function adaptSolanaStandardWallet(walletInfo: SolanaWalletInfo, options?: AdaptSolanaWalletOptions): SolanaWallet;
 
-export { adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };
+export { SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };
 export type { AdaptSolanaWalletOptions };

package/dist/wallet-standard.d.ts

@@ -2,6 +2,7 @@ import { WalletAccount, Wallet } from '@wallet-standard/base';
 import { SolanaChain, SolanaWalletInfo, SolanaWallet, SolanaCluster } from './types.js';
 import '@solana/web3-compat';
 
+declare const SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = "Mobile Wallet Adapter";
 interface AdaptSolanaWalletOptions {
     chain?: SolanaChain;
     account?: WalletAccount;
@@ -13,5 +14,5 @@ declare function getRegisteredSolanaWallets(): SolanaWalletInfo[];
 declare function subscribeSolanaWallets(listener: () => void): () => void;
 declare function adaptSolanaStandardWallet(walletInfo: SolanaWalletInfo, options?: AdaptSolanaWalletOptions): SolanaWallet;
 
-export { adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };
+export { SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };
 export type { AdaptSolanaWalletOptions };

package/dist/wallet-standard.mjs

@@ -1,5 +1,4 @@
 import { getWallets } from '@wallet-standard/app';
-import { SolanaMobileWalletAdapterWalletName } from '@solana-mobile/wallet-standard-mobile';
 import { StandardEvents, StandardDisconnect, StandardConnect } from '@wallet-standard/features';
 import { SolanaSignAndSendTransaction, SolanaSignTransaction } from '@solana/wallet-standard-features';
 import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3-compat';
@@ -11,6 +10,7 @@ const SOLANA_CHAINS = [
   "solana:devnet",
   "solana:localnet"
 ];
+const SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME = "Mobile Wallet Adapter";
 function getSolanaChain(cluster) {
   if (cluster === "mainnet-beta") {
     return "solana:mainnet";
@@ -56,6 +56,8 @@ function adaptSolanaStandardWallet(walletInfo, options = {}) {
     }
   });
   return {
+    platform: walletInfo.platform,
+    source: walletInfo.source,
     get publicKey() {
       return account ? new PublicKey(account.publicKey) : null;
     },
@@ -148,7 +150,7 @@ function adaptSolanaStandardWallet(walletInfo, options = {}) {
   };
 }
 function createSolanaWalletInfo(wallet) {
-  const isMobileWallet = wallet.name === SolanaMobileWalletAdapterWalletName;
+  const isMobileWallet = wallet.name === SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME;
   return {
     name: wallet.name,
     icon: wallet.icon,
@@ -208,4 +210,4 @@ function deserializeTransaction(source, bytes) {
   return VersionedTransaction.deserialize(bytes);
 }
 
-export { adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };
+export { SOLANA_MOBILE_WALLET_ADAPTER_WALLET_NAME, adaptSolanaStandardWallet, getRegisteredSolanaWallets, getSolanaChain, isSolanaStandardWallet, subscribeSolanaWallets };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-solana/core",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Framework-agnostic primitives for Vue Solana libraries.",
   "license": "MIT",
   "keywords": [