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

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-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, 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, WalletProvider, WarpAdapterGenericTransaction } from '@vleap/warps';
 import { Transaction } from '@solana/web3.js';
 
 declare const NativeTokenSol: WarpChainAsset;
@@ -166,7 +166,11 @@ declare class WarpSolanaWallet implements AdapterWarpWallet {
     private config;
     private chain;
     private connection;
-    constructor(config: WarpClientConfig, chain: WarpChainInfo);
+    private walletProvider;
+    private cachedAddress;
+    private cachedPublicKey;
+    constructor(config: WarpClientConfig, chain: WarpChainInfo, walletProvider?: WalletProvider);
+    private initializeCache;
     signTransaction(tx: WarpAdapterGenericTransaction): Promise<WarpAdapterGenericTransaction>;
     signTransactions(txs: WarpAdapterGenericTransaction[]): Promise<WarpAdapterGenericTransaction[]>;
     signMessage(message: string): Promise<string>;
@@ -184,7 +188,6 @@ declare class WarpSolanaWallet implements AdapterWarpWallet {
     };
     getAddress(): string | null;
     getPublicKey(): string | null;
-    private getKeypair;
 }
 
 export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenSol, SolanaExplorerMap, SolanaExplorerNames, SolanaExplorerUrls, SolanaExplorers, type TokenBalance, type TokenMetadata, WarpSolanaConstants, WarpSolanaDataLoader, WarpSolanaExecutor, WarpSolanaExplorer, WarpSolanaOutput, WarpSolanaSerializer, WarpSolanaWallet, findKnownTokenById, getKnownTokensForChain, getSolanaAdapter };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-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, 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, WalletProvider, WarpAdapterGenericTransaction } from '@vleap/warps';
 import { Transaction } from '@solana/web3.js';
 
 declare const NativeTokenSol: WarpChainAsset;
@@ -166,7 +166,11 @@ declare class WarpSolanaWallet implements AdapterWarpWallet {
     private config;
     private chain;
     private connection;
-    constructor(config: WarpClientConfig, chain: WarpChainInfo);
+    private walletProvider;
+    private cachedAddress;
+    private cachedPublicKey;
+    constructor(config: WarpClientConfig, chain: WarpChainInfo, walletProvider?: WalletProvider);
+    private initializeCache;
     signTransaction(tx: WarpAdapterGenericTransaction): Promise<WarpAdapterGenericTransaction>;
     signTransactions(txs: WarpAdapterGenericTransaction[]): Promise<WarpAdapterGenericTransaction[]>;
     signMessage(message: string): Promise<string>;
@@ -184,7 +188,6 @@ declare class WarpSolanaWallet implements AdapterWarpWallet {
     };
     getAddress(): string | null;
     getPublicKey(): string | null;
-    private getKeypair;
 }
 
 export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenSol, SolanaExplorerMap, SolanaExplorerNames, SolanaExplorerUrls, SolanaExplorers, type TokenBalance, type TokenMetadata, WarpSolanaConstants, WarpSolanaDataLoader, WarpSolanaExecutor, WarpSolanaExplorer, WarpSolanaOutput, WarpSolanaSerializer, WarpSolanaWallet, findKnownTokenById, getKnownTokensForChain, getSolanaAdapter };

package/dist/index.js

@@ -51,7 +51,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/chains/solana.ts
-var import_warps7 = require("@vleap/warps");
+var import_warps8 = require("@vleap/warps");
 
 // src/WarpSolanaDataLoader.ts
 var import_warps2 = require("@vleap/warps");
@@ -1271,20 +1271,41 @@ var WarpSolanaExplorer = class {
 };
 
 // src/WarpSolanaWallet.ts
-var import_warps6 = require("@vleap/warps");
+var bip392 = __toESM(require("@scure/bip39"), 1);
+var import_english = 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);
+
+// src/providers/SolanaWalletProvider.ts
 var import_web35 = require("@solana/web3.js");
 var bip39 = __toESM(require("@scure/bip39"), 1);
-var import_english = require("@scure/bip39/wordlists/english.js");
 var import_bs582 = __toESM(require("bs58"), 1);
-var WarpSolanaWallet = class {
-  constructor(config, chain) {
+var import_warps6 = require("@vleap/warps");
+var SolanaWalletProvider = 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() {
+    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,28 +1332,6 @@ var WarpSolanaWallet = class {
     }
     throw new Error("Invalid transaction format");
   }
-  async signTransactions(txs) {
-    if (txs.length === 0) return [];
-    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);
-          transaction.sign(keypair);
-          return { ...tx, transaction: transaction.serialize() };
-        }
-        throw new Error("Invalid transaction format");
-      })
-    );
-  }
   async signMessage(message) {
     const keypair = this.getKeypair();
     const messageBytes = new TextEncoder().encode(message);
@@ -1349,26 +1348,90 @@ var WarpSolanaWallet = class {
     const signature = nacl.sign.detached(messageBytes, privateKeyBytes);
     return import_bs582.default.encode(signature);
   }
+  getKeypairInstance() {
+    return this.getKeypair();
+  }
+  getKeypair() {
+    if (this.keypair) return this.keypair;
+    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) {
+          this.keypair = import_web35.Keypair.fromSecretKey(secretKey);
+          return this.keypair;
+        } else if (secretKey.length === 32) {
+          this.keypair = import_web35.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");
+      }
+    }
+    const mnemonic = (0, import_warps6.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
+    if (mnemonic) {
+      const seed = bip39.mnemonicToSeedSync(mnemonic);
+      this.keypair = import_web35.Keypair.fromSeed(seed.slice(0, 32));
+      return this.keypair;
+    }
+    throw new Error("No private key or mnemonic provided");
+  }
+};
+
+// src/WarpSolanaWallet.ts
+var WarpSolanaWallet = class {
+  constructor(config, chain, walletProvider) {
+    this.config = config;
+    this.chain = chain;
+    this.cachedAddress = null;
+    this.cachedPublicKey = null;
+    const providerConfig = (0, import_warps7.getProviderConfig)(config, chain.name, config.env, chain.defaultApiUrl);
+    this.connection = new import_web36.Connection(providerConfig.url, "confirmed");
+    this.walletProvider = walletProvider || new SolanaWalletProvider(config, chain, this.connection);
+    this.initializeCache();
+  }
+  initializeCache() {
+    (0, import_warps7.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");
+    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) {
+    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_web36.VersionedTransaction) {
       transaction = tx;
-    } else if (tx instanceof import_web35.Transaction) {
+    } else if (tx instanceof import_web36.Transaction) {
       transaction = tx;
     } else if (tx.transaction) {
-      if (tx.transaction instanceof import_web35.Transaction) {
+      if (tx.transaction instanceof import_web36.Transaction) {
         transaction = tx.transaction;
-      } else if (tx.transaction instanceof import_web35.VersionedTransaction) {
+      } else if (tx.transaction instanceof import_web36.VersionedTransaction) {
         transaction = tx.transaction;
       } else if (typeof tx.transaction === "object") {
         try {
-          transaction = import_web35.Transaction.from(tx.transaction);
+          transaction = import_web36.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_web36.Transaction.from(tx.transaction);
       } else {
         throw new Error("Transaction must be signed before sending");
       }
@@ -1385,65 +1448,29 @@ 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));
+    const seed = bip392.mnemonicToSeedSync(mnemonic);
+    const keypair = import_web36.Keypair.fromSeed(seed.slice(0, 32));
     return {
       address: keypair.publicKey.toBase58(),
-      privateKey: import_bs582.default.encode(keypair.secretKey),
+      privateKey: import_bs583.default.encode(keypair.secretKey),
       mnemonic
     };
   }
   generate() {
-    const keypair = import_web35.Keypair.generate();
+    const keypair = import_web36.Keypair.generate();
     const entropy = keypair.secretKey.slice(0, 16);
-    const mnemonic = bip39.entropyToMnemonic(entropy, import_english.wordlist);
+    const mnemonic = bip392.entropyToMnemonic(entropy, import_english.wordlist);
     return {
       address: keypair.publicKey.toBase58(),
-      privateKey: import_bs582.default.encode(keypair.secretKey),
+      privateKey: import_bs583.default.encode(keypair.secretKey),
       mnemonic
     };
   }
   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));
-    }
-    throw new Error("No private key or mnemonic provided");
+    return this.cachedPublicKey;
   }
 };
 
@@ -1469,16 +1496,16 @@ var createSolanaAdapter = (chainName, chainInfos) => {
 
 // src/chains/solana.ts
 var NativeTokenSol = {
-  chain: import_warps7.WarpChainName.Solana,
+  chain: import_warps8.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 getSolanaAdapter = createSolanaAdapter(import_warps8.WarpChainName.Solana, {
   mainnet: {
-    name: import_warps7.WarpChainName.Solana,
+    name: import_warps8.WarpChainName.Solana,
     displayName: "Solana Mainnet",
     chainId: "101",
     blockTime: 400,
@@ -1488,7 +1515,7 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
     nativeToken: NativeTokenSol
   },
   testnet: {
-    name: import_warps7.WarpChainName.Solana,
+    name: import_warps8.WarpChainName.Solana,
     displayName: "Solana Testnet",
     chainId: "103",
     blockTime: 400,
@@ -1498,7 +1525,7 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
     nativeToken: NativeTokenSol
   },
   devnet: {
-    name: import_warps7.WarpChainName.Solana,
+    name: import_warps8.WarpChainName.Solana,
     displayName: "Solana Devnet",
     chainId: "103",
     blockTime: 400,