@vue-solana/core 1.1.0 → 2.0.0

package/dist/ios-wallet.d.ts

@@ -1,7 +1,5 @@
-/// <reference path="../types/web3-compat.d.ts" />
-/// <reference path="../types/buffer.d.ts" />
-import { SolanaChain, SolanaCluster, SolanaWalletInfo, SolanaWallet } from './types.js';
-import '@solana/web3-compat';
+import { a as SolanaChain, c as SolanaCluster, i as SolanaWalletInfo, h as SolanaWallet } from './shared/core.DMgTrB_2.js';
+import '@solana/kit';
 
 interface SolanaIosWalletAppIdentity {
     name: string;

package/dist/ios-wallet.mjs

@@ -1,4 +1,4 @@
-export { a as adaptSolanaIosWallet, g as getDefaultIosWalletAppIdentity, b as getDefaultIosWalletRedirectUrl, c as getSolanaIosWallets, h as handleSolanaIosWalletCallback, i as isIosBrowser, d as isSolanaIosBrowserWalletSupported, e as isSolanaIosWalletInfo } from './shared/core.Ch_Z7_17.mjs';
-import '@solana/web3-compat';
+export { a as adaptSolanaIosWallet, g as getDefaultIosWalletAppIdentity, b as getDefaultIosWalletRedirectUrl, c as getSolanaIosWallets, h as handleSolanaIosWalletCallback, i as isIosBrowser, d as isSolanaIosBrowserWalletSupported, e as isSolanaIosWalletInfo } from './shared/core.BwW4HVQI.mjs';
+import '@solana/kit';
 import 'bs58';
 import 'tweetnacl';

package/dist/kit.cjs

@@ -0,0 +1,21 @@
+'use strict';
+
+const kit = require('@solana/kit');
+const kitPluginRpc = require('@solana/kit-plugin-rpc');
+const clusters = require('./clusters.cjs');
+
+function createSolanaClient(config = {}) {
+  const cluster = config.cluster ?? clusters.DEFAULT_CLUSTER;
+  const endpoint = config.endpoint ?? clusters.getClusterEndpoint(cluster);
+  const wsEndpoint = config.wsEndpoint ?? (config.endpoint ? clusters.getWebSocketEndpoint(endpoint) : clusters.getClusterWebSocketEndpoint(cluster));
+  return kit.createClient().use(
+    kitPluginRpc.solanaRpcConnection({
+      rpcUrl: endpoint,
+      rpcSubscriptionsUrl: wsEndpoint
+    })
+  );
+}
+
+exports.address = kit.address;
+exports.lamports = kit.lamports;
+exports.createSolanaClient = createSolanaClient;

package/dist/kit.d.cts

@@ -0,0 +1,2 @@
+export { Address, Commitment, Lamports, Rpc, Signature, SolanaRpcApi, address, lamports } from '@solana/kit';
+export { b as SolanaClient, k as createSolanaClient } from './shared/core.DMgTrB_2.cjs';

package/dist/kit.d.mts

@@ -0,0 +1,2 @@
+export { Address, Commitment, Lamports, Rpc, Signature, SolanaRpcApi, address, lamports } from '@solana/kit';
+export { b as SolanaClient, k as createSolanaClient } from './shared/core.DMgTrB_2.mjs';

package/dist/kit.d.ts

@@ -0,0 +1,2 @@
+export { Address, Commitment, Lamports, Rpc, Signature, SolanaRpcApi, address, lamports } from '@solana/kit';
+export { b as SolanaClient, k as createSolanaClient } from './shared/core.DMgTrB_2.js';

package/dist/kit.mjs

@@ -0,0 +1,18 @@
+import { createClient } from '@solana/kit';
+export { address, lamports } from '@solana/kit';
+import { solanaRpcConnection } from '@solana/kit-plugin-rpc';
+import { DEFAULT_CLUSTER, getClusterEndpoint, getWebSocketEndpoint, getClusterWebSocketEndpoint } from './clusters.mjs';
+
+function createSolanaClient(config = {}) {
+  const cluster = config.cluster ?? DEFAULT_CLUSTER;
+  const endpoint = config.endpoint ?? getClusterEndpoint(cluster);
+  const wsEndpoint = config.wsEndpoint ?? (config.endpoint ? getWebSocketEndpoint(endpoint) : getClusterWebSocketEndpoint(cluster));
+  return createClient().use(
+    solanaRpcConnection({
+      rpcUrl: endpoint,
+      rpcSubscriptionsUrl: wsEndpoint
+    })
+  );
+}
+
+export { createSolanaClient };

package/dist/mobile-wallet.d.cts

@@ -1,7 +1,5 @@
-/// <reference path="../types/web3-compat.d.ts" />
-/// <reference path="../types/buffer.d.ts" />
-import { SolanaChain } from './types.cjs';
-import '@solana/web3-compat';
+import { a as SolanaChain } from './shared/core.DMgTrB_2.cjs';
+import '@solana/kit';
 
 interface SolanaMobileWalletAppIdentity {
     name: string;

package/dist/mobile-wallet.d.mts

@@ -1,7 +1,5 @@
-/// <reference path="../types/web3-compat.d.ts" />
-/// <reference path="../types/buffer.d.ts" />
-import { SolanaChain } from './types.mjs';
-import '@solana/web3-compat';
+import { a as SolanaChain } from './shared/core.DMgTrB_2.mjs';
+import '@solana/kit';
 
 interface SolanaMobileWalletAppIdentity {
     name: string;

package/dist/mobile-wallet.d.ts

@@ -1,7 +1,5 @@
-/// <reference path="../types/web3-compat.d.ts" />
-/// <reference path="../types/buffer.d.ts" />
-import { SolanaChain } from './types.js';
-import '@solana/web3-compat';
+import { a as SolanaChain } from './shared/core.DMgTrB_2.js';
+import '@solana/kit';
 
 interface SolanaMobileWalletAppIdentity {
     name: string;

package/dist/rpc.cjs

@@ -1,17 +1,10 @@
 'use strict';
 
-const web3Compat = require('@solana/web3-compat');
 const clusters = require('./clusters.cjs');
+const kit = require('./kit.cjs');
+require('@solana/kit');
+require('@solana/kit-plugin-rpc');
 
-function createSolanaConnection(config = {}) {
-  const cluster = config.cluster ?? clusters.DEFAULT_CLUSTER;
-  const endpoint = config.endpoint ?? clusters.getClusterEndpoint(cluster);
-  const wsEndpoint = config.wsEndpoint ?? (config.endpoint ? clusters.getWebSocketEndpoint(endpoint) : clusters.getClusterWebSocketEndpoint(cluster));
-  return new web3Compat.Connection(endpoint, {
-    commitment: config.commitment,
-    wsEndpoint
-  });
-}
 function createSolanaContext(config = {}) {
   const cluster = config.cluster ?? clusters.DEFAULT_CLUSTER;
   const endpoint = config.endpoint ?? clusters.getClusterEndpoint(cluster);
@@ -20,9 +13,8 @@ function createSolanaContext(config = {}) {
     cluster,
     endpoint,
     wsEndpoint,
-    connection: createSolanaConnection(config)
+    client: kit.createSolanaClient(config)
   };
 }
 
-exports.createSolanaConnection = createSolanaConnection;
 exports.createSolanaContext = createSolanaContext;

package/dist/rpc.d.cts

@@ -1,9 +1,6 @@
-/// <reference path="../types/web3-compat.d.ts" />
-/// <reference path="../types/buffer.d.ts" />
-import { Connection } from '@solana/web3-compat';
-import { SolanaConfig, SolanaContext } from './types.cjs';
+import { d as SolanaConfig, e as SolanaContext } from './shared/core.DMgTrB_2.cjs';
+import '@solana/kit';
 
-declare function createSolanaConnection(config?: SolanaConfig): Connection;
 declare function createSolanaContext(config?: SolanaConfig): SolanaContext;
 
-export { createSolanaConnection, createSolanaContext };
+export { createSolanaContext };

package/dist/rpc.d.mts

@@ -1,9 +1,6 @@
-/// <reference path="../types/web3-compat.d.ts" />
-/// <reference path="../types/buffer.d.ts" />
-import { Connection } from '@solana/web3-compat';
-import { SolanaConfig, SolanaContext } from './types.mjs';
+import { d as SolanaConfig, e as SolanaContext } from './shared/core.DMgTrB_2.mjs';
+import '@solana/kit';
 
-declare function createSolanaConnection(config?: SolanaConfig): Connection;
 declare function createSolanaContext(config?: SolanaConfig): SolanaContext;
 
-export { createSolanaConnection, createSolanaContext };
+export { createSolanaContext };

package/dist/rpc.d.ts

@@ -1,9 +1,6 @@
-/// <reference path="../types/web3-compat.d.ts" />
-/// <reference path="../types/buffer.d.ts" />
-import { Connection } from '@solana/web3-compat';
-import { SolanaConfig, SolanaContext } from './types.js';
+import { d as SolanaConfig, e as SolanaContext } from './shared/core.DMgTrB_2.js';
+import '@solana/kit';
 
-declare function createSolanaConnection(config?: SolanaConfig): Connection;
 declare function createSolanaContext(config?: SolanaConfig): SolanaContext;
 
-export { createSolanaConnection, createSolanaContext };
+export { createSolanaContext };

package/dist/rpc.mjs

@@ -1,15 +1,8 @@
-import { Connection } from '@solana/web3-compat';
 import { DEFAULT_CLUSTER, getClusterEndpoint, getWebSocketEndpoint, getClusterWebSocketEndpoint } from './clusters.mjs';
+import { createSolanaClient } from './kit.mjs';
+import '@solana/kit';
+import '@solana/kit-plugin-rpc';
 
-function createSolanaConnection(config = {}) {
-  const cluster = config.cluster ?? DEFAULT_CLUSTER;
-  const endpoint = config.endpoint ?? getClusterEndpoint(cluster);
-  const wsEndpoint = config.wsEndpoint ?? (config.endpoint ? getWebSocketEndpoint(endpoint) : getClusterWebSocketEndpoint(cluster));
-  return new Connection(endpoint, {
-    commitment: config.commitment,
-    wsEndpoint
-  });
-}
 function createSolanaContext(config = {}) {
   const cluster = config.cluster ?? DEFAULT_CLUSTER;
   const endpoint = config.endpoint ?? getClusterEndpoint(cluster);
@@ -18,8 +11,8 @@ function createSolanaContext(config = {}) {
     cluster,
     endpoint,
     wsEndpoint,
-    connection: createSolanaConnection(config)
+    client: createSolanaClient(config)
   };
 }
 
-export { createSolanaConnection, createSolanaContext };
+export { createSolanaContext };

package/dist/shared/{core.BBMCTQpw.mjs → core.BOHiMZiM.mjs}

@@ -1,8 +1,6 @@
 import { StandardEvents, StandardDisconnect, StandardConnect } from '@wallet-standard/features';
 import { SolanaSignAndSendTransaction, SolanaSignTransaction, SolanaSignMessage } from '@solana/wallet-standard-features';
-import { Transaction, VersionedTransaction, PublicKey } from '@solana/web3-compat';
 import bs58 from 'bs58';
-import { SolanaWalletError } from '../wallet.mjs';
 import { getWallets } from '@wallet-standard/app';
 
 const SOLANA_CHAINS = [
@@ -28,19 +26,6 @@ function hasSignMessage(wallet) {
   return SolanaSignMessage in wallet.features;
 }
 
-function serializeTransaction(transaction) {
-  if (transaction instanceof Transaction) {
-    return transaction.serialize({ requireAllSignatures: false, verifySignatures: false });
-  }
-  return transaction.serialize();
-}
-function deserializeTransaction(source, bytes) {
-  if (source instanceof Transaction) {
-    return Transaction.from(bytes);
-  }
-  return VersionedTransaction.deserialize(bytes);
-}
-
 function adaptSolanaStandardWallet(walletInfo, options = {}) {
   const wallet = walletInfo.wallet;
   let accounts = wallet.accounts;
@@ -61,7 +46,7 @@ function adaptSolanaStandardWallet(walletInfo, options = {}) {
     platform: walletInfo.platform,
     source: walletInfo.source,
     get publicKey() {
-      return account ? new PublicKey(account.publicKey) : null;
+      return account ? account.address : null;
     },
     get connected() {
       return Boolean(account);
@@ -126,20 +111,20 @@ function adaptSolanaStandardWallet(walletInfo, options = {}) {
       const activeAccount = getActiveAccount(account);
       const [result] = await wallet.features[SolanaSignTransaction].signTransaction({
         account: activeAccount,
-        transaction: serializeTransaction(transaction),
+        transaction,
         chain: options.chain
       });
       if (!result) {
         throw new Error("Solana wallet did not return a signed transaction");
       }
-      return deserializeTransaction(transaction, result.signedTransaction);
+      return result.signedTransaction;
     } : void 0,
     signAllTransactions: hasSignTransaction(wallet) ? async (transactions) => {
       const activeAccount = getActiveAccount(account);
       const results = await wallet.features[SolanaSignTransaction].signTransaction(
         ...transactions.map((transaction) => ({
           account: activeAccount,
-          transaction: serializeTransaction(transaction),
+          transaction,
           chain: options.chain
         }))
       );
@@ -148,26 +133,18 @@ function adaptSolanaStandardWallet(walletInfo, options = {}) {
           `Solana wallet returned ${results.length} signed transactions for ${transactions.length} requested transactions`
         );
       }
-      return results.map((result, index) => {
+      return results.map((result) => {
         if (!result) {
           throw new Error("Solana wallet did not return a signed transaction");
         }
-        const transaction = transactions[index];
-        if (!transaction) {
-          throw new SolanaWalletError(
-            "WALLET_FEATURE_UNSUPPORTED",
-            "Solana wallet returned a signed transaction without a matching request",
-            { feature: "signTransaction" }
-          );
-        }
-        return deserializeTransaction(transaction, result.signedTransaction);
+        return result.signedTransaction;
       });
     } : void 0,
     signAndSendTransaction: hasSignAndSendTransaction(wallet) ? async (transaction, sendOptions) => {
       const activeAccount = getActiveAccount(account);
       const [result] = await wallet.features[SolanaSignAndSendTransaction].signAndSendTransaction({
         account: activeAccount,
-        transaction: serializeTransaction(transaction),
+        transaction,
         chain: options.chain ?? getSolanaAccountChain(activeAccount),
         options: sendOptions
       });

package/dist/shared/{core.Ch_Z7_17.mjs → core.BwW4HVQI.mjs}

@@ -1,4 +1,4 @@
-import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3-compat';
+import { isAddress } from '@solana/kit';
 import bs58 from 'bs58';
 import * as naclModule from 'tweetnacl';
 
@@ -206,7 +206,7 @@ function getStoredIosWalletAccount(walletId, chains) {
   return [
     {
       address: session.publicKey,
-      publicKey: new PublicKey(session.publicKey).toBytes(),
+      publicKey: bs58.decode(session.publicKey),
       chains
     }
   ];
@@ -218,7 +218,9 @@ function getStoredSession(walletId) {
   }
   try {
     const session = JSON.parse(value);
-    new PublicKey(session.publicKey);
+    if (!isAddress(session.publicKey)) {
+      throw new Error("Invalid stored public key");
+    }
     return session;
   } catch {
     removeStoredSession(walletId);
@@ -371,27 +373,12 @@ function getStringField(payload, field) {
 }
 function getPublicKeyField(payload, field) {
   const value = getStringField(payload, field);
-  try {
-    new PublicKey(value);
-  } catch {
+  if (!isAddress(value)) {
     throw new Error(`iOS wallet callback returned an invalid ${field}`);
   }
   return value;
 }
 
-function serializeTransaction(transaction) {
-  if (transaction instanceof Transaction) {
-    return transaction.serialize({ requireAllSignatures: false, verifySignatures: false });
-  }
-  return transaction.serialize();
-}
-function deserializeTransaction(source, bytes) {
-  if (source instanceof Transaction) {
-    return Transaction.from(bytes);
-  }
-  return VersionedTransaction.deserialize(bytes);
-}
-
 function launchConnect(definition, options) {
   const keyPair = nacl.box.keyPair();
   const pending = createPendingRequest(definition.id, "connect", keyPair, options.redirectUrl);
@@ -408,7 +395,7 @@ function launchConnect(definition, options) {
 }
 async function launchSignTransaction(definition, transaction, options) {
   const response = await launchEncryptedWalletRequest(definition, "signTransaction", options, {
-    transaction: bs58.encode(serializeTransaction(transaction))
+    transaction: bs58.encode(transaction)
   });
   if (!response.transaction) {
     throw new Error("iOS wallet did not return a signed transaction");
@@ -417,7 +404,7 @@ async function launchSignTransaction(definition, transaction, options) {
 }
 async function launchSignAllTransactions(definition, transactions, options) {
   const response = await launchEncryptedWalletRequest(definition, "signAllTransactions", options, {
-    transactions: transactions.map((transaction) => bs58.encode(serializeTransaction(transaction)))
+    transactions: transactions.map((transaction) => bs58.encode(transaction))
   });
   if (!response.transactions) {
     throw new Error("iOS wallet did not return signed transactions");
@@ -430,7 +417,7 @@ async function launchSignAndSendTransaction(definition, transaction, sendOptions
     "signAndSendTransaction",
     options,
     {
-      transaction: bs58.encode(serializeTransaction(transaction)),
+      transaction: bs58.encode(transaction),
       sendOptions
     }
   );
@@ -515,7 +502,7 @@ function adaptSolanaIosWallet(walletInfo, options = {}) {
   }
   return {
     get publicKey() {
-      return session?.publicKey ? new PublicKey(session.publicKey) : null;
+      return session?.publicKey ? session.publicKey : null;
     },
     get connected() {
       return Boolean(session?.publicKey && session.session);
@@ -554,8 +541,7 @@ function adaptSolanaIosWallet(walletInfo, options = {}) {
       }
     },
     signTransaction: definition.signTransactionUrl ? async (transaction) => {
-      const signedTransaction = await launchSignTransaction(definition, transaction, options);
-      return deserializeTransaction(transaction, signedTransaction);
+      return launchSignTransaction(definition, transaction, options);
     } : void 0,
     signAllTransactions: definition.signAllTransactionsUrl ? async (transactions) => {
       const signedTransactions = await launchSignAllTransactions(
@@ -568,9 +554,7 @@ function adaptSolanaIosWallet(walletInfo, options = {}) {
           `iOS wallet returned ${signedTransactions.length} signed transactions for ${transactions.length} requested transactions`
         );
       }
-      return signedTransactions.map(
-        (transaction, index) => deserializeTransaction(transactions[index], transaction)
-      );
+      return signedTransactions;
     } : void 0,
     signAndSendTransaction: definition.signAndSendTransactionUrl ? async (transaction, sendOptions) => launchSignAndSendTransaction(definition, transaction, sendOptions, options) : void 0
   };

package/dist/shared/{core.BsekSwcZ.cjs → core.Cb48vQvC.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-const web3Compat = require('@solana/web3-compat');
+const kit = require('@solana/kit');
 const bs58 = require('bs58');
 const naclModule = require('tweetnacl');
 
@@ -225,7 +225,7 @@ function getStoredIosWalletAccount(walletId, chains) {
   return [
     {
       address: session.publicKey,
-      publicKey: new web3Compat.PublicKey(session.publicKey).toBytes(),
+      publicKey: bs58__default.decode(session.publicKey),
       chains
     }
   ];
@@ -237,7 +237,9 @@ function getStoredSession(walletId) {
   }
   try {
     const session = JSON.parse(value);
-    new web3Compat.PublicKey(session.publicKey);
+    if (!kit.isAddress(session.publicKey)) {
+      throw new Error("Invalid stored public key");
+    }
     return session;
   } catch {
     removeStoredSession(walletId);
@@ -390,27 +392,12 @@ function getStringField(payload, field) {
 }
 function getPublicKeyField(payload, field) {
   const value = getStringField(payload, field);
-  try {
-    new web3Compat.PublicKey(value);
-  } catch {
+  if (!kit.isAddress(value)) {
     throw new Error(`iOS wallet callback returned an invalid ${field}`);
   }
   return value;
 }
 
-function serializeTransaction(transaction) {
-  if (transaction instanceof web3Compat.Transaction) {
-    return transaction.serialize({ requireAllSignatures: false, verifySignatures: false });
-  }
-  return transaction.serialize();
-}
-function deserializeTransaction(source, bytes) {
-  if (source instanceof web3Compat.Transaction) {
-    return web3Compat.Transaction.from(bytes);
-  }
-  return web3Compat.VersionedTransaction.deserialize(bytes);
-}
-
 function launchConnect(definition, options) {
   const keyPair = nacl.box.keyPair();
   const pending = createPendingRequest(definition.id, "connect", keyPair, options.redirectUrl);
@@ -427,7 +414,7 @@ function launchConnect(definition, options) {
 }
 async function launchSignTransaction(definition, transaction, options) {
   const response = await launchEncryptedWalletRequest(definition, "signTransaction", options, {
-    transaction: bs58__default.encode(serializeTransaction(transaction))
+    transaction: bs58__default.encode(transaction)
   });
   if (!response.transaction) {
     throw new Error("iOS wallet did not return a signed transaction");
@@ -436,7 +423,7 @@ async function launchSignTransaction(definition, transaction, options) {
 }
 async function launchSignAllTransactions(definition, transactions, options) {
   const response = await launchEncryptedWalletRequest(definition, "signAllTransactions", options, {
-    transactions: transactions.map((transaction) => bs58__default.encode(serializeTransaction(transaction)))
+    transactions: transactions.map((transaction) => bs58__default.encode(transaction))
   });
   if (!response.transactions) {
     throw new Error("iOS wallet did not return signed transactions");
@@ -449,7 +436,7 @@ async function launchSignAndSendTransaction(definition, transaction, sendOptions
     "signAndSendTransaction",
     options,
     {
-      transaction: bs58__default.encode(serializeTransaction(transaction)),
+      transaction: bs58__default.encode(transaction),
       sendOptions
     }
   );
@@ -534,7 +521,7 @@ function adaptSolanaIosWallet(walletInfo, options = {}) {
   }
   return {
     get publicKey() {
-      return session?.publicKey ? new web3Compat.PublicKey(session.publicKey) : null;
+      return session?.publicKey ? session.publicKey : null;
     },
     get connected() {
       return Boolean(session?.publicKey && session.session);
@@ -573,8 +560,7 @@ function adaptSolanaIosWallet(walletInfo, options = {}) {
       }
     },
     signTransaction: definition.signTransactionUrl ? async (transaction) => {
-      const signedTransaction = await launchSignTransaction(definition, transaction, options);
-      return deserializeTransaction(transaction, signedTransaction);
+      return launchSignTransaction(definition, transaction, options);
     } : void 0,
     signAllTransactions: definition.signAllTransactionsUrl ? async (transactions) => {
       const signedTransactions = await launchSignAllTransactions(
@@ -587,9 +573,7 @@ function adaptSolanaIosWallet(walletInfo, options = {}) {
           `iOS wallet returned ${signedTransactions.length} signed transactions for ${transactions.length} requested transactions`
         );
       }
-      return signedTransactions.map(
-        (transaction, index) => deserializeTransaction(transactions[index], transaction)
-      );
+      return signedTransactions;
     } : void 0,
     signAndSendTransaction: definition.signAndSendTransactionUrl ? async (transaction, sendOptions) => launchSignAndSendTransaction(definition, transaction, sendOptions, options) : void 0
   };