@vleap/warps-adapter-solana 0.1.0-beta.5 → 0.1.0-beta.7

package/dist/index.d.cts

@@ -1,8 +1,8 @@
-import { WarpChainAsset, AdapterFactory, WarpChain, WarpChainEnv, AdapterWarpDataLoader, WarpClientConfig, WarpChainInfo, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecutionResult, AdapterWarpExplorer, AdapterWarpOutput, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionOutput, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
+import { WarpChainAsset, ChainAdapterFactory, WarpChain, WarpChainEnv, AdapterWarpDataLoader, WarpClientConfig, WarpChainInfo, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecutionResult, AdapterWarpExplorer, AdapterWarpOutput, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionOutput, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction, WarpWalletDetails } from '@vleap/warps';
 import { Transaction } from '@solana/web3.js';
 
 declare const NativeTokenSol: WarpChainAsset;
-declare const getSolanaAdapter: AdapterFactory;
+declare const SolanaAdapter: ChainAdapterFactory;
 
 declare const WarpSolanaConstants: {
     ComputeUnitLimit: {
@@ -50,21 +50,25 @@ declare const SolanaExplorerNames: {
     readonly devnet: readonly [SolanaExplorers.SolscanDevnet, SolanaExplorers.SolanaExplorerDevnet];
 };
 declare const SolanaExplorerUrls: Record<ExplorerName, string>;
+declare const X402SolanaNetworkIdentifiers: {
+    readonly Mainnet: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+    readonly Devnet: "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
+};
+declare const SupportedX402SolanaNetworks: string[];
 
 declare const KnownTokens: Record<WarpChain, Record<string, WarpChainAsset[]>>;
 declare const findKnownTokenById: (chain: WarpChain, env: WarpChainEnv, id: string) => WarpChainAsset | null;
 declare const getKnownTokensForChain: (chainName: string, env?: string) => WarpChainAsset[];
 
-interface TokenMetadata {
-    name: string;
-    symbol: string;
-    decimals: number;
-    logoUrl?: string;
+declare module '@solana/kit' {
+  export function createKeyPairSignerFromBytes(bytes: Uint8Array): Promise<{
+    signMessage: (message: Uint8Array) => Promise<Uint8Array>
+    signTransaction: (transaction: unknown) => Promise<unknown>
+  }>
 }
-interface TokenBalance {
-    tokenAddress: string;
-    balance: bigint;
-    metadata: TokenMetadata;
+
+declare module '@x402/svm/exact/client' {
+  export function registerExactSvmScheme(client: unknown, options: { signer: unknown }): void
 }
 
 declare class WarpSolanaDataLoader implements AdapterWarpDataLoader {
@@ -166,25 +170,22 @@ declare class WarpSolanaWallet implements AdapterWarpWallet {
     private config;
     private chain;
     private connection;
+    private walletProvider;
+    private cachedAddress;
+    private cachedPublicKey;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
+    private createProvider;
+    private initializeCache;
     signTransaction(tx: WarpAdapterGenericTransaction): Promise<WarpAdapterGenericTransaction>;
     signTransactions(txs: WarpAdapterGenericTransaction[]): Promise<WarpAdapterGenericTransaction[]>;
     signMessage(message: string): Promise<string>;
     sendTransaction(tx: WarpAdapterGenericTransaction): Promise<string>;
     sendTransactions(txs: WarpAdapterGenericTransaction[]): Promise<string[]>;
-    create(mnemonic: string): {
-        address: string;
-        privateKey: string;
-        mnemonic: string;
-    };
-    generate(): {
-        address: string;
-        privateKey: string;
-        mnemonic: string;
-    };
+    create(mnemonic: string): WarpWalletDetails;
+    generate(): WarpWalletDetails;
     getAddress(): string | null;
     getPublicKey(): string | null;
-    private getKeypair;
+    registerX402Handlers(client: unknown): Promise<Record<string, () => void>>;
 }
 
-export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenSol, SolanaExplorerMap, SolanaExplorerNames, SolanaExplorerUrls, SolanaExplorers, type TokenBalance, type TokenMetadata, WarpSolanaConstants, WarpSolanaDataLoader, WarpSolanaExecutor, WarpSolanaExplorer, WarpSolanaOutput, WarpSolanaSerializer, WarpSolanaWallet, findKnownTokenById, getKnownTokensForChain, getSolanaAdapter };
+export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenSol, SolanaAdapter, SolanaExplorerMap, SolanaExplorerNames, SolanaExplorerUrls, SolanaExplorers, SupportedX402SolanaNetworks, WarpSolanaConstants, WarpSolanaDataLoader, WarpSolanaExecutor, WarpSolanaExplorer, WarpSolanaOutput, WarpSolanaSerializer, WarpSolanaWallet, X402SolanaNetworkIdentifiers, findKnownTokenById, getKnownTokensForChain };

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { WarpChainAsset, AdapterFactory, WarpChain, WarpChainEnv, AdapterWarpDataLoader, WarpClientConfig, WarpChainInfo, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecutionResult, AdapterWarpExplorer, AdapterWarpOutput, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionOutput, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
+import { WarpChainAsset, ChainAdapterFactory, WarpChain, WarpChainEnv, AdapterWarpDataLoader, WarpClientConfig, WarpChainInfo, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecutionResult, AdapterWarpExplorer, AdapterWarpOutput, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionOutput, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction, WarpWalletDetails } from '@vleap/warps';
 import { Transaction } from '@solana/web3.js';
 
 declare const NativeTokenSol: WarpChainAsset;
-declare const getSolanaAdapter: AdapterFactory;
+declare const SolanaAdapter: ChainAdapterFactory;
 
 declare const WarpSolanaConstants: {
     ComputeUnitLimit: {
@@ -50,21 +50,25 @@ declare const SolanaExplorerNames: {
     readonly devnet: readonly [SolanaExplorers.SolscanDevnet, SolanaExplorers.SolanaExplorerDevnet];
 };
 declare const SolanaExplorerUrls: Record<ExplorerName, string>;
+declare const X402SolanaNetworkIdentifiers: {
+    readonly Mainnet: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+    readonly Devnet: "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
+};
+declare const SupportedX402SolanaNetworks: string[];
 
 declare const KnownTokens: Record<WarpChain, Record<string, WarpChainAsset[]>>;
 declare const findKnownTokenById: (chain: WarpChain, env: WarpChainEnv, id: string) => WarpChainAsset | null;
 declare const getKnownTokensForChain: (chainName: string, env?: string) => WarpChainAsset[];
 
-interface TokenMetadata {
-    name: string;
-    symbol: string;
-    decimals: number;
-    logoUrl?: string;
+declare module '@solana/kit' {
+  export function createKeyPairSignerFromBytes(bytes: Uint8Array): Promise<{
+    signMessage: (message: Uint8Array) => Promise<Uint8Array>
+    signTransaction: (transaction: unknown) => Promise<unknown>
+  }>
 }
-interface TokenBalance {
-    tokenAddress: string;
-    balance: bigint;
-    metadata: TokenMetadata;
+
+declare module '@x402/svm/exact/client' {
+  export function registerExactSvmScheme(client: unknown, options: { signer: unknown }): void
 }
 
 declare class WarpSolanaDataLoader implements AdapterWarpDataLoader {
@@ -166,25 +170,22 @@ declare class WarpSolanaWallet implements AdapterWarpWallet {
     private config;
     private chain;
     private connection;
+    private walletProvider;
+    private cachedAddress;
+    private cachedPublicKey;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
+    private createProvider;
+    private initializeCache;
     signTransaction(tx: WarpAdapterGenericTransaction): Promise<WarpAdapterGenericTransaction>;
     signTransactions(txs: WarpAdapterGenericTransaction[]): Promise<WarpAdapterGenericTransaction[]>;
     signMessage(message: string): Promise<string>;
     sendTransaction(tx: WarpAdapterGenericTransaction): Promise<string>;
     sendTransactions(txs: WarpAdapterGenericTransaction[]): Promise<string[]>;
-    create(mnemonic: string): {
-        address: string;
-        privateKey: string;
-        mnemonic: string;
-    };
-    generate(): {
-        address: string;
-        privateKey: string;
-        mnemonic: string;
-    };
+    create(mnemonic: string): WarpWalletDetails;
+    generate(): WarpWalletDetails;
     getAddress(): string | null;
     getPublicKey(): string | null;
-    private getKeypair;
+    registerX402Handlers(client: unknown): Promise<Record<string, () => void>>;
 }
 
-export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenSol, SolanaExplorerMap, SolanaExplorerNames, SolanaExplorerUrls, SolanaExplorers, type TokenBalance, type TokenMetadata, WarpSolanaConstants, WarpSolanaDataLoader, WarpSolanaExecutor, WarpSolanaExplorer, WarpSolanaOutput, WarpSolanaSerializer, WarpSolanaWallet, findKnownTokenById, getKnownTokensForChain, getSolanaAdapter };
+export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenSol, SolanaAdapter, SolanaExplorerMap, SolanaExplorerNames, SolanaExplorerUrls, SolanaExplorers, SupportedX402SolanaNetworks, WarpSolanaConstants, WarpSolanaDataLoader, WarpSolanaExecutor, WarpSolanaExplorer, WarpSolanaOutput, WarpSolanaSerializer, WarpSolanaWallet, X402SolanaNetworkIdentifiers, findKnownTokenById, getKnownTokensForChain };

package/dist/index.js

@@ -33,10 +33,12 @@ __export(index_exports, {
   ExplorerUrls: () => ExplorerUrls,
   KnownTokens: () => KnownTokens,
   NativeTokenSol: () => NativeTokenSol,
+  SolanaAdapter: () => SolanaAdapter,
   SolanaExplorerMap: () => SolanaExplorerMap,
   SolanaExplorerNames: () => SolanaExplorerNames,
   SolanaExplorerUrls: () => SolanaExplorerUrls,
   SolanaExplorers: () => SolanaExplorers,
+  SupportedX402SolanaNetworks: () => SupportedX402SolanaNetworks,
   WarpSolanaConstants: () => WarpSolanaConstants,
   WarpSolanaDataLoader: () => WarpSolanaDataLoader,
   WarpSolanaExecutor: () => WarpSolanaExecutor,
@@ -44,14 +46,14 @@ __export(index_exports, {
   WarpSolanaOutput: () => WarpSolanaOutput,
   WarpSolanaSerializer: () => WarpSolanaSerializer,
   WarpSolanaWallet: () => WarpSolanaWallet,
+  X402SolanaNetworkIdentifiers: () => X402SolanaNetworkIdentifiers,
   findKnownTokenById: () => findKnownTokenById,
-  getKnownTokensForChain: () => getKnownTokensForChain,
-  getSolanaAdapter: () => getSolanaAdapter
+  getKnownTokensForChain: () => getKnownTokensForChain
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/chains/solana.ts
-var import_warps7 = require("@vleap/warps");
+var import_warps9 = require("@vleap/warps");
 
 // src/WarpSolanaDataLoader.ts
 var import_warps2 = require("@vleap/warps");
@@ -112,6 +114,11 @@ var SolanaExplorerNames = {
   devnet: ["solscan_devnet" /* SolscanDevnet */, "solana_explorer_devnet" /* SolanaExplorerDevnet */]
 };
 var SolanaExplorerUrls = ExplorerUrls;
+var X402SolanaNetworkIdentifiers = {
+  Mainnet: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
+  Devnet: "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1"
+};
+var SupportedX402SolanaNetworks = [X402SolanaNetworkIdentifiers.Mainnet, X402SolanaNetworkIdentifiers.Devnet];
 
 // src/tokens/solana.ts
 var import_warps = require("@vleap/warps");
@@ -1271,20 +1278,43 @@ var WarpSolanaExplorer = class {
 };
 
 // src/WarpSolanaWallet.ts
-var import_warps6 = require("@vleap/warps");
-var import_web35 = require("@solana/web3.js");
+var import_kit = require("@solana/kit");
+var import_web37 = require("@solana/web3.js");
+var import_warps8 = require("@vleap/warps");
+var import_client = require("@x402/svm/exact/client");
+
+// src/providers/MnemonicWalletProvider.ts
 var bip39 = __toESM(require("@scure/bip39"), 1);
 var import_english = require("@scure/bip39/wordlists/english.js");
+var import_web35 = require("@solana/web3.js");
+var import_warps6 = require("@vleap/warps");
 var import_bs582 = __toESM(require("bs58"), 1);
-var WarpSolanaWallet = class {
-  constructor(config, chain) {
+var MnemonicWalletProvider = class {
+  constructor(config, chain, connection) {
     this.config = config;
     this.chain = chain;
-    const providerConfig = (0, import_warps6.getProviderConfig)(config, chain.name, config.env, chain.defaultApiUrl);
-    this.connection = new import_web35.Connection(providerConfig.url, "confirmed");
+    this.connection = connection;
+    this.keypair = null;
+  }
+  async getAddress() {
+    const address = (0, import_warps6.getWarpWalletAddressFromConfig)(this.config, this.chain.name);
+    if (address) return address;
+    try {
+      const keypair = this.getKeypair();
+      return keypair.publicKey.toBase58();
+    } catch {
+      return null;
+    }
+  }
+  async getPublicKey() {
+    try {
+      const keypair = this.getKeypair();
+      return keypair.publicKey.toBase58();
+    } catch {
+      return null;
+    }
   }
   async signTransaction(tx) {
-    if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
     const keypair = this.getKeypair();
     if (tx instanceof import_web35.VersionedTransaction) {
       tx.sign([keypair]);
@@ -1311,27 +1341,113 @@ var WarpSolanaWallet = class {
     }
     throw new Error("Invalid transaction format");
   }
-  async signTransactions(txs) {
-    if (txs.length === 0) return [];
+  async signMessage(message) {
     const keypair = this.getKeypair();
-    return Promise.all(
-      txs.map(async (tx) => {
-        if (tx instanceof import_web35.VersionedTransaction) {
-          tx.sign([keypair]);
-          return tx;
-        }
-        if (tx instanceof import_web35.Transaction) {
-          tx.sign(keypair);
-          return tx;
-        }
-        if (tx.transaction && typeof tx.transaction === "object") {
-          const transaction = import_web35.Transaction.from(tx.transaction);
+    const messageBytes = new TextEncoder().encode(message);
+    const nacl = await import("tweetnacl");
+    const secretKey = keypair.secretKey;
+    if (secretKey.length !== 64) {
+      throw new Error(`Invalid secret key length: expected 64, got ${secretKey.length}`);
+    }
+    const privateKeySlice = secretKey.slice(0, 32);
+    const privateKeyBytes = new Uint8Array(privateKeySlice);
+    if (privateKeyBytes.length !== 32) {
+      throw new Error(`Invalid private key length: expected 32, got ${privateKeyBytes.length}`);
+    }
+    const signature = nacl.sign.detached(messageBytes, privateKeyBytes);
+    return import_bs582.default.encode(signature);
+  }
+  getKeypairInstance() {
+    return this.getKeypair();
+  }
+  create(mnemonic) {
+    const seed = bip39.mnemonicToSeedSync(mnemonic);
+    const keypair = import_web35.Keypair.fromSeed(seed.slice(0, 32));
+    return {
+      provider: "mnemonic",
+      address: keypair.publicKey.toBase58(),
+      privateKey: import_bs582.default.encode(keypair.secretKey),
+      mnemonic
+    };
+  }
+  generate() {
+    const keypair = import_web35.Keypair.generate();
+    const entropy = keypair.secretKey.slice(0, 16);
+    const mnemonic = bip39.entropyToMnemonic(entropy, import_english.wordlist);
+    return {
+      provider: "mnemonic",
+      address: keypair.publicKey.toBase58(),
+      privateKey: import_bs582.default.encode(keypair.secretKey),
+      mnemonic
+    };
+  }
+  getKeypair() {
+    if (this.keypair) return this.keypair;
+    const mnemonic = (0, import_warps6.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
+    if (!mnemonic) throw new Error("No mnemonic provided");
+    const seed = bip39.mnemonicToSeedSync(mnemonic);
+    this.keypair = import_web35.Keypair.fromSeed(seed.slice(0, 32));
+    return this.keypair;
+  }
+};
+
+// src/providers/PrivateKeyWalletProvider.ts
+var bip392 = __toESM(require("@scure/bip39"), 1);
+var import_english2 = require("@scure/bip39/wordlists/english.js");
+var import_web36 = require("@solana/web3.js");
+var import_warps7 = require("@vleap/warps");
+var import_bs583 = __toESM(require("bs58"), 1);
+var PrivateKeyWalletProvider = class {
+  constructor(config, chain, connection) {
+    this.config = config;
+    this.chain = chain;
+    this.connection = connection;
+    this.keypair = null;
+  }
+  async getAddress() {
+    const address = (0, import_warps7.getWarpWalletAddressFromConfig)(this.config, this.chain.name);
+    if (address) return address;
+    try {
+      const keypair = this.getKeypair();
+      return keypair.publicKey.toBase58();
+    } catch {
+      return null;
+    }
+  }
+  async getPublicKey() {
+    try {
+      const keypair = this.getKeypair();
+      return keypair.publicKey.toBase58();
+    } catch {
+      return null;
+    }
+  }
+  async signTransaction(tx) {
+    const keypair = this.getKeypair();
+    if (tx instanceof import_web36.VersionedTransaction) {
+      tx.sign([keypair]);
+      return tx;
+    }
+    if (tx instanceof import_web36.Transaction) {
+      tx.sign(keypair);
+      return tx;
+    }
+    if (tx.transaction) {
+      if (tx.transaction instanceof import_web36.Transaction) {
+        tx.transaction.sign(keypair);
+        return { ...tx, transaction: tx.transaction.serialize() };
+      }
+      if (typeof tx.transaction === "object") {
+        try {
+          const transaction = import_web36.Transaction.from(tx.transaction);
           transaction.sign(keypair);
-          return { ...tx, transaction: transaction.serialize() };
+          return { ...tx, transaction: transaction.serialize(), signature: transaction.signature };
+        } catch {
+          throw new Error("Invalid transaction format");
         }
-        throw new Error("Invalid transaction format");
-      })
-    );
+      }
+    }
+    throw new Error("Invalid transaction format");
   }
   async signMessage(message) {
     const keypair = this.getKeypair();
@@ -1347,28 +1463,118 @@ var WarpSolanaWallet = class {
       throw new Error(`Invalid private key length: expected 32, got ${privateKeyBytes.length}`);
     }
     const signature = nacl.sign.detached(messageBytes, privateKeyBytes);
-    return import_bs582.default.encode(signature);
+    return import_bs583.default.encode(signature);
+  }
+  getKeypairInstance() {
+    return this.getKeypair();
+  }
+  create(mnemonic) {
+    const seed = bip392.mnemonicToSeedSync(mnemonic);
+    const keypair = import_web36.Keypair.fromSeed(seed.slice(0, 32));
+    return {
+      provider: "privateKey",
+      address: keypair.publicKey.toBase58(),
+      privateKey: import_bs583.default.encode(keypair.secretKey),
+      mnemonic
+    };
+  }
+  generate() {
+    const keypair = import_web36.Keypair.generate();
+    const entropy = keypair.secretKey.slice(0, 16);
+    const mnemonic = bip392.entropyToMnemonic(entropy, import_english2.wordlist);
+    return {
+      provider: "privateKey",
+      address: keypair.publicKey.toBase58(),
+      privateKey: import_bs583.default.encode(keypair.secretKey),
+      mnemonic
+    };
+  }
+  getKeypair() {
+    if (this.keypair) return this.keypair;
+    const privateKey = (0, import_warps7.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
+    if (!privateKey) throw new Error("No private key provided");
+    try {
+      const secretKey = import_bs583.default.decode(privateKey);
+      if (secretKey.length === 64) {
+        this.keypair = import_web36.Keypair.fromSecretKey(secretKey);
+        return this.keypair;
+      } else if (secretKey.length === 32) {
+        this.keypair = import_web36.Keypair.fromSeed(secretKey);
+        return this.keypair;
+      } else {
+        throw new Error(`Invalid private key length: expected 32 or 64 bytes, got ${secretKey.length}`);
+      }
+    } catch (error) {
+      if (error instanceof Error) {
+        throw new Error(`Invalid private key format: ${error.message}`);
+      }
+      throw new Error("Invalid private key format");
+    }
+  }
+};
+
+// src/WarpSolanaWallet.ts
+var WarpSolanaWallet = class {
+  constructor(config, chain) {
+    this.config = config;
+    this.chain = chain;
+    this.cachedAddress = null;
+    this.cachedPublicKey = null;
+    const providerConfig = (0, import_warps8.getProviderConfig)(config, chain.name, config.env, chain.defaultApiUrl);
+    this.connection = new import_web37.Connection(providerConfig.url, "confirmed");
+    this.walletProvider = this.createProvider();
+    this.initializeCache();
+  }
+  createProvider() {
+    const wallet = this.config.user?.wallets?.[this.chain.name];
+    if (!wallet) return null;
+    if (typeof wallet === "string") throw new Error(`Wallet can not be used for signing: ${wallet}`);
+    const customWalletProviders = this.config.walletProviders?.[this.chain.name];
+    const providerFactory = customWalletProviders?.[wallet.provider];
+    if (providerFactory) return providerFactory(this.config, this.chain);
+    if (wallet.provider === "privateKey") return new PrivateKeyWalletProvider(this.config, this.chain, this.connection);
+    if (wallet.provider === "mnemonic") return new MnemonicWalletProvider(this.config, this.chain, this.connection);
+    throw new Error(`Unsupported wallet provider for ${this.chain.name}: ${wallet.provider}`);
+  }
+  initializeCache() {
+    (0, import_warps8.initializeWalletCache)(this.walletProvider).then((cache) => {
+      this.cachedAddress = cache.address;
+      this.cachedPublicKey = cache.publicKey;
+    });
+  }
+  async signTransaction(tx) {
+    if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    return await this.walletProvider.signTransaction(tx);
+  }
+  async signTransactions(txs) {
+    if (txs.length === 0) return [];
+    return Promise.all(txs.map(async (tx) => this.signTransaction(tx)));
+  }
+  async signMessage(message) {
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    return await this.walletProvider.signMessage(message);
   }
   async sendTransaction(tx) {
     if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
     let transaction;
-    if (tx instanceof import_web35.VersionedTransaction) {
+    if (tx instanceof import_web37.VersionedTransaction) {
       transaction = tx;
-    } else if (tx instanceof import_web35.Transaction) {
+    } else if (tx instanceof import_web37.Transaction) {
       transaction = tx;
     } else if (tx.transaction) {
-      if (tx.transaction instanceof import_web35.Transaction) {
+      if (tx.transaction instanceof import_web37.Transaction) {
         transaction = tx.transaction;
-      } else if (tx.transaction instanceof import_web35.VersionedTransaction) {
+      } else if (tx.transaction instanceof import_web37.VersionedTransaction) {
         transaction = tx.transaction;
       } else if (typeof tx.transaction === "object") {
         try {
-          transaction = import_web35.Transaction.from(tx.transaction);
+          transaction = import_web37.Transaction.from(tx.transaction);
         } catch {
           throw new Error("Invalid transaction format");
         }
       } else if (Buffer.isBuffer(tx.transaction) || typeof tx.transaction === "string") {
-        transaction = import_web35.Transaction.from(tx.transaction);
+        transaction = import_web37.Transaction.from(tx.transaction);
       } else {
         throw new Error("Transaction must be signed before sending");
       }
@@ -1385,65 +1591,34 @@ var WarpSolanaWallet = class {
     return Promise.all(txs.map(async (tx) => this.sendTransaction(tx)));
   }
   create(mnemonic) {
-    const seed = bip39.mnemonicToSeedSync(mnemonic);
-    const keypair = import_web35.Keypair.fromSeed(seed.slice(0, 32));
-    return {
-      address: keypair.publicKey.toBase58(),
-      privateKey: import_bs582.default.encode(keypair.secretKey),
-      mnemonic
-    };
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    return this.walletProvider.create(mnemonic);
   }
   generate() {
-    const keypair = import_web35.Keypair.generate();
-    const entropy = keypair.secretKey.slice(0, 16);
-    const mnemonic = bip39.entropyToMnemonic(entropy, import_english.wordlist);
-    return {
-      address: keypair.publicKey.toBase58(),
-      privateKey: import_bs582.default.encode(keypair.secretKey),
-      mnemonic
-    };
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    return this.walletProvider.generate();
   }
   getAddress() {
-    try {
-      const keypair = this.getKeypair();
-      return keypair.publicKey.toBase58();
-    } catch {
-      return null;
-    }
+    return this.cachedAddress;
   }
   getPublicKey() {
-    try {
-      const keypair = this.getKeypair();
-      return keypair.publicKey.toBase58();
-    } catch {
-      return null;
-    }
-  }
-  getKeypair() {
-    const privateKey = (0, import_warps6.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
-    if (privateKey) {
-      try {
-        const secretKey = import_bs582.default.decode(privateKey);
-        if (secretKey.length === 64) {
-          return import_web35.Keypair.fromSecretKey(secretKey);
-        } else if (secretKey.length === 32) {
-          return import_web35.Keypair.fromSeed(secretKey);
-        } else {
-          throw new Error(`Invalid private key length: expected 32 or 64 bytes, got ${secretKey.length}`);
-        }
-      } catch (error) {
-        if (error instanceof Error) {
-          throw new Error(`Invalid private key format: ${error.message}`);
-        }
-        throw new Error("Invalid private key format");
-      }
-    }
-    const mnemonic = (0, import_warps6.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
-    if (mnemonic) {
-      const seed = bip39.mnemonicToSeedSync(mnemonic);
-      return import_web35.Keypair.fromSeed(seed.slice(0, 32));
+    return this.cachedPublicKey;
+  }
+  async registerX402Handlers(client) {
+    if (!this.walletProvider) return {};
+    const provider = this.walletProvider;
+    const getKeypair = provider.getKeypairInstance;
+    if (typeof getKeypair !== "function") return {};
+    const keypair = getKeypair();
+    if (!keypair || !keypair.secretKey) return {};
+    const signer = await (0, import_kit.createKeyPairSignerFromBytes)(keypair.secretKey);
+    const handlers = {};
+    for (const network of SupportedX402SolanaNetworks) {
+      handlers[network] = () => {
+        (0, import_client.registerExactSvmScheme)(client, { signer });
+      };
     }
-    throw new Error("No private key or mnemonic provided");
+    return handlers;
   }
 };
 
@@ -1469,16 +1644,16 @@ var createSolanaAdapter = (chainName, chainInfos) => {
 
 // src/chains/solana.ts
 var NativeTokenSol = {
-  chain: import_warps7.WarpChainName.Solana,
+  chain: import_warps9.WarpChainName.Solana,
   identifier: "SOL",
   symbol: "SOL",
   name: "Solana",
   decimals: 9,
   logoUrl: "https://joai.ai/images/tokens/sol.svg"
 };
-var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
+var SolanaAdapter = createSolanaAdapter(import_warps9.WarpChainName.Solana, {
   mainnet: {
-    name: import_warps7.WarpChainName.Solana,
+    name: import_warps9.WarpChainName.Solana,
     displayName: "Solana Mainnet",
     chainId: "101",
     blockTime: 400,
@@ -1488,7 +1663,7 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
     nativeToken: NativeTokenSol
   },
   testnet: {
-    name: import_warps7.WarpChainName.Solana,
+    name: import_warps9.WarpChainName.Solana,
     displayName: "Solana Testnet",
     chainId: "103",
     blockTime: 400,
@@ -1498,7 +1673,7 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
     nativeToken: NativeTokenSol
   },
   devnet: {
-    name: import_warps7.WarpChainName.Solana,
+    name: import_warps9.WarpChainName.Solana,
     displayName: "Solana Devnet",
     chainId: "103",
     blockTime: 400,
@@ -1513,10 +1688,12 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
   ExplorerUrls,
   KnownTokens,
   NativeTokenSol,
+  SolanaAdapter,
   SolanaExplorerMap,
   SolanaExplorerNames,
   SolanaExplorerUrls,
   SolanaExplorers,
+  SupportedX402SolanaNetworks,
   WarpSolanaConstants,
   WarpSolanaDataLoader,
   WarpSolanaExecutor,
@@ -1524,8 +1701,8 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
   WarpSolanaOutput,
   WarpSolanaSerializer,
   WarpSolanaWallet,
+  X402SolanaNetworkIdentifiers,
   findKnownTokenById,
-  getKnownTokensForChain,
-  getSolanaAdapter
+  getKnownTokensForChain
 });
 //# sourceMappingURL=index.js.map