@vleap/warps-adapter-near 0.1.0-beta.4 → 0.1.0-beta.5

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-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';
 
 declare const NativeTokenNear: WarpChainAsset;
-declare const getNearAdapter: AdapterFactory;
+declare const NearAdapter: ChainAdapterFactory;
 
 declare const WarpNearConstants: {
     NativeToken: {
@@ -131,25 +131,21 @@ declare class WarpNearWallet implements AdapterWarpWallet {
     private config;
     private chain;
     private nearConfig;
+    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;
 }
 
-export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenNear, NearExplorerMap, NearExplorerNames, NearExplorerUrls, NearExplorers, NearTokens, WarpNearConstants, WarpNearDataLoader, WarpNearExecutor, WarpNearExplorer, WarpNearOutput, WarpNearSerializer, WarpNearWallet, findKnownTokenById, getKnownTokensForChain, getNearAdapter };
+export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenNear, NearAdapter, NearExplorerMap, NearExplorerNames, NearExplorerUrls, NearExplorers, NearTokens, WarpNearConstants, WarpNearDataLoader, WarpNearExecutor, WarpNearExplorer, WarpNearOutput, WarpNearSerializer, WarpNearWallet, findKnownTokenById, getKnownTokensForChain };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-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';
 
 declare const NativeTokenNear: WarpChainAsset;
-declare const getNearAdapter: AdapterFactory;
+declare const NearAdapter: ChainAdapterFactory;
 
 declare const WarpNearConstants: {
     NativeToken: {
@@ -131,25 +131,21 @@ declare class WarpNearWallet implements AdapterWarpWallet {
     private config;
     private chain;
     private nearConfig;
+    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;
 }
 
-export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenNear, NearExplorerMap, NearExplorerNames, NearExplorerUrls, NearExplorers, NearTokens, WarpNearConstants, WarpNearDataLoader, WarpNearExecutor, WarpNearExplorer, WarpNearOutput, WarpNearSerializer, WarpNearWallet, findKnownTokenById, getKnownTokensForChain, getNearAdapter };
+export { type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenNear, NearAdapter, NearExplorerMap, NearExplorerNames, NearExplorerUrls, NearExplorers, NearTokens, WarpNearConstants, WarpNearDataLoader, WarpNearExecutor, WarpNearExplorer, WarpNearOutput, WarpNearSerializer, WarpNearWallet, findKnownTokenById, getKnownTokensForChain };

package/dist/index.js

@@ -33,6 +33,7 @@ __export(index_exports, {
   ExplorerUrls: () => ExplorerUrls,
   KnownTokens: () => KnownTokens,
   NativeTokenNear: () => NativeTokenNear,
+  NearAdapter: () => NearAdapter,
   NearExplorerMap: () => NearExplorerMap,
   NearExplorerNames: () => NearExplorerNames,
   NearExplorerUrls: () => NearExplorerUrls,
@@ -46,8 +47,7 @@ __export(index_exports, {
   WarpNearSerializer: () => WarpNearSerializer,
   WarpNearWallet: () => WarpNearWallet,
   findKnownTokenById: () => findKnownTokenById,
-  getKnownTokensForChain: () => getKnownTokensForChain,
-  getNearAdapter: () => getNearAdapter
+  getKnownTokensForChain: () => getKnownTokensForChain
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -929,73 +929,54 @@ var WarpNearExplorer = class {
 };
 
 // src/WarpNearWallet.ts
+var import_warps7 = require("@vleap/warps");
+var import_near_api_js6 = require("near-api-js");
+
+// src/providers/MnemonicWalletProvider.ts
 var import_crypto = require("@near-js/crypto");
 var bip39 = __toESM(require("@scure/bip39"), 1);
 var import_english = require("@scure/bip39/wordlists/english.js");
 var import_warps5 = require("@vleap/warps");
 var import_bs58 = __toESM(require("bs58"), 1);
 var import_near_api_js4 = require("near-api-js");
-var WarpNearWallet = class {
+var MnemonicWalletProvider = class {
   constructor(config, chain) {
     this.config = config;
     this.chain = chain;
-    const providerConfig = (0, import_warps5.getProviderConfig)(config, chain.name, config.env, chain.defaultApiUrl);
-    this.nearConfig = {
-      networkId: this.config.env === "mainnet" ? "mainnet" : this.config.env === "testnet" ? "testnet" : "testnet",
-      nodeUrl: providerConfig.url,
-      keyStore: new import_near_api_js4.keyStores.InMemoryKeyStore()
-    };
+    this.keypair = null;
   }
-  async signTransaction(tx) {
-    if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
-    const keyPair = this.getKeyPair();
-    const accountId = this.getAddress();
-    if (!accountId) throw new Error("No account ID available");
-    await this.nearConfig.keyStore.setKey(this.nearConfig.networkId, accountId, keyPair);
-    const near = await (0, import_near_api_js4.connect)(this.nearConfig);
-    const account = await near.account(accountId);
-    if (tx.signature) {
-      return tx;
+  async getAddress() {
+    const address = (0, import_warps5.getWarpWalletAddressFromConfig)(this.config, this.chain.name);
+    if (address) return address;
+    try {
+      const keypair = this.getKeyPair();
+      const publicKey = keypair.getPublicKey();
+      return (0, import_crypto.keyToImplicitAddress)(publicKey.toString());
+    } catch {
+      return null;
     }
-    const signedTx = await account.signAndSendTransaction({
-      receiverId: tx.receiverId,
-      actions: tx.actions
-    });
-    return {
-      ...tx,
-      signature: signedTx.transaction.hash,
-      transactionHash: signedTx.transaction.hash
-    };
   }
-  async signTransactions(txs) {
-    if (txs.length === 0) return [];
-    return Promise.all(txs.map(async (tx) => this.signTransaction(tx)));
+  async getPublicKey() {
+    try {
+      const keypair = this.getKeyPair();
+      const publicKey = keypair.getPublicKey();
+      return publicKey.toString();
+    } catch {
+      return null;
+    }
+  }
+  async signTransaction(tx) {
+    const keypair = this.getKeyPair();
+    return tx;
   }
   async signMessage(message) {
-    const keyPair = this.getKeyPair();
+    const keypair = this.getKeyPair();
     const messageBytes = new TextEncoder().encode(message);
-    const signature = keyPair.sign(messageBytes);
+    const signature = keypair.sign(messageBytes);
     return import_bs58.default.encode(signature.signature);
   }
-  async sendTransaction(tx) {
-    if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
-    const keyPair = this.getKeyPair();
-    const accountId = this.getAddress();
-    if (!accountId) throw new Error("No account ID available");
-    await this.nearConfig.keyStore.setKey(this.nearConfig.networkId, accountId, keyPair);
-    const near = await (0, import_near_api_js4.connect)(this.nearConfig);
-    const account = await near.account(accountId);
-    if (tx.transactionHash) {
-      return tx.transactionHash;
-    }
-    const result = await account.signAndSendTransaction({
-      receiverId: tx.receiverId,
-      actions: tx.actions
-    });
-    return result.transaction.hash;
-  }
-  async sendTransactions(txs) {
-    return Promise.all(txs.map(async (tx) => this.sendTransaction(tx)));
+  getKeyPairInstance() {
+    return this.getKeyPair();
   }
   create(mnemonic) {
     const seed = bip39.mnemonicToSeedSync(mnemonic);
@@ -1003,6 +984,7 @@ var WarpNearWallet = class {
     const publicKey = keyPair.getPublicKey();
     const accountId = (0, import_crypto.keyToImplicitAddress)(publicKey.toString());
     return {
+      provider: "mnemonic",
       address: accountId,
       privateKey: keyPair.toString(),
       mnemonic
@@ -1015,75 +997,211 @@ var WarpNearWallet = class {
     const publicKey = keyPair.getPublicKey();
     const accountId = (0, import_crypto.keyToImplicitAddress)(publicKey.toString());
     return {
+      provider: "mnemonic",
       address: accountId,
       privateKey: keyPair.toString(),
       mnemonic
     };
   }
-  getAddress() {
+  getKeyPair() {
+    if (this.keypair) return this.keypair;
+    const mnemonic = (0, import_warps5.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
+    if (!mnemonic) throw new Error("No mnemonic provided");
+    const seed = bip39.mnemonicToSeedSync(mnemonic);
+    this.keypair = import_near_api_js4.KeyPair.fromRandom("ed25519");
+    return this.keypair;
+  }
+};
+
+// src/providers/PrivateKeyWalletProvider.ts
+var import_crypto2 = require("@near-js/crypto");
+var bip392 = __toESM(require("@scure/bip39"), 1);
+var import_english2 = require("@scure/bip39/wordlists/english.js");
+var import_warps6 = require("@vleap/warps");
+var import_bs582 = __toESM(require("bs58"), 1);
+var import_near_api_js5 = require("near-api-js");
+var PrivateKeyWalletProvider = class {
+  constructor(config, chain) {
+    this.config = config;
+    this.chain = chain;
+    this.keypair = null;
+  }
+  async getAddress() {
+    const address = (0, import_warps6.getWarpWalletAddressFromConfig)(this.config, this.chain.name);
+    if (address) return address;
     try {
-      const wallet = this.config.user?.wallets?.[this.chain.name];
-      if (wallet && typeof wallet === "object" && "address" in wallet) {
-        return wallet.address;
-      }
-      if (wallet && typeof wallet === "string") {
-        return wallet;
-      }
-      const privateKey = (0, import_warps5.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
-      if (privateKey) {
-        try {
-          const keyPair = import_near_api_js4.KeyPair.fromString(privateKey);
-          const publicKey = keyPair.getPublicKey();
-          return (0, import_crypto.keyToImplicitAddress)(publicKey.toString());
-        } catch {
-          return null;
-        }
-      }
-      const mnemonic = (0, import_warps5.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
-      if (mnemonic) {
-        const seed = bip39.mnemonicToSeedSync(mnemonic);
-        const keyPair = import_near_api_js4.KeyPair.fromRandom("ed25519");
-        const publicKey = keyPair.getPublicKey();
-        return (0, import_crypto.keyToImplicitAddress)(publicKey.toString());
-      }
-      return null;
+      const keypair = this.getKeyPair();
+      const publicKey = keypair.getPublicKey();
+      return (0, import_crypto2.keyToImplicitAddress)(publicKey.toString());
     } catch {
       return null;
     }
   }
-  getPublicKey() {
+  async getPublicKey() {
     try {
-      const keyPair = this.getKeyPair();
-      const publicKey = keyPair.getPublicKey();
+      const keypair = this.getKeyPair();
+      const publicKey = keypair.getPublicKey();
       return publicKey.toString();
     } catch {
       return null;
     }
   }
+  async signTransaction(tx) {
+    const keypair = this.getKeyPair();
+    return tx;
+  }
+  async signMessage(message) {
+    const keypair = this.getKeyPair();
+    const messageBytes = new TextEncoder().encode(message);
+    const signature = keypair.sign(messageBytes);
+    return import_bs582.default.encode(signature.signature);
+  }
+  getKeyPairInstance() {
+    return this.getKeyPair();
+  }
+  create(mnemonic) {
+    const seed = bip392.mnemonicToSeedSync(mnemonic);
+    const keyPair = import_near_api_js5.KeyPair.fromRandom("ed25519");
+    const publicKey = keyPair.getPublicKey();
+    const accountId = (0, import_crypto2.keyToImplicitAddress)(publicKey.toString());
+    return {
+      provider: "privateKey",
+      address: accountId,
+      privateKey: keyPair.toString(),
+      mnemonic
+    };
+  }
+  generate() {
+    const mnemonic = bip392.generateMnemonic(import_english2.wordlist);
+    const seed = bip392.mnemonicToSeedSync(mnemonic);
+    const keyPair = import_near_api_js5.KeyPair.fromRandom("ed25519");
+    const publicKey = keyPair.getPublicKey();
+    const accountId = (0, import_crypto2.keyToImplicitAddress)(publicKey.toString());
+    return {
+      provider: "privateKey",
+      address: accountId,
+      privateKey: keyPair.toString(),
+      mnemonic
+    };
+  }
   getKeyPair() {
-    const privateKey = (0, import_warps5.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
-    if (privateKey) {
-      try {
-        try {
-          return import_near_api_js4.KeyPair.fromString(privateKey);
-        } catch {
-        }
-        const keyPair = import_near_api_js4.KeyPair.fromRandom("ed25519");
-        return keyPair;
-      } catch (error) {
-        if (error instanceof Error) {
-          throw new Error(`Invalid private key format: ${error.message}`);
-        }
-        throw new Error("Invalid private key format");
+    if (this.keypair) return this.keypair;
+    const privateKey = (0, import_warps6.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
+    if (!privateKey) throw new Error("No private key provided");
+    try {
+      return import_near_api_js5.KeyPair.fromString(privateKey);
+    } 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_warps5.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
-    if (mnemonic) {
-      const seed = bip39.mnemonicToSeedSync(mnemonic);
-      const keyPair = import_near_api_js4.KeyPair.fromRandom("ed25519");
-      return keyPair;
+  }
+};
+
+// src/WarpNearWallet.ts
+var WarpNearWallet = class {
+  constructor(config, chain) {
+    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.nearConfig = {
+      networkId: this.config.env === "mainnet" ? "mainnet" : this.config.env === "testnet" ? "testnet" : "testnet",
+      nodeUrl: providerConfig.url,
+      keyStore: new import_near_api_js6.keyStores.InMemoryKeyStore()
+    };
+    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);
+    if (wallet.provider === "mnemonic") return new MnemonicWalletProvider(this.config, this.chain);
+    throw new Error(`Unsupported wallet provider for ${this.chain.name}: ${wallet.provider}`);
+  }
+  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");
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    const accountId = this.getAddress();
+    if (!accountId) throw new Error("No account ID available");
+    if (this.walletProvider instanceof PrivateKeyWalletProvider || this.walletProvider instanceof MnemonicWalletProvider) {
+      const keyPair = this.walletProvider.getKeyPairInstance();
+      await this.nearConfig.keyStore.setKey(this.nearConfig.networkId, accountId, keyPair);
+      const near = await (0, import_near_api_js6.connect)(this.nearConfig);
+      const account = await near.account(accountId);
+      if (tx.signature) {
+        return tx;
+      }
+      const signedTx = await account.signAndSendTransaction({
+        receiverId: tx.receiverId,
+        actions: tx.actions
+      });
+      return {
+        ...tx,
+        signature: signedTx.transaction.hash,
+        transactionHash: signedTx.transaction.hash
+      };
     }
-    throw new Error("No private key or mnemonic provided");
+    throw new Error("Wallet provider does not support signing transactions");
+  }
+  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");
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    const accountId = this.getAddress();
+    if (!accountId) throw new Error("No account ID available");
+    if (tx.transactionHash) {
+      return tx.transactionHash;
+    }
+    if (this.walletProvider instanceof PrivateKeyWalletProvider || this.walletProvider instanceof MnemonicWalletProvider) {
+      const keyPair = this.walletProvider.getKeyPairInstance();
+      await this.nearConfig.keyStore.setKey(this.nearConfig.networkId, accountId, keyPair);
+      const near = await (0, import_near_api_js6.connect)(this.nearConfig);
+      const account = await near.account(accountId);
+      const result = await account.signAndSendTransaction({
+        receiverId: tx.receiverId,
+        actions: tx.actions
+      });
+      return result.transaction.hash;
+    }
+    throw new Error("Wallet provider does not support sending transactions");
+  }
+  async sendTransactions(txs) {
+    return Promise.all(txs.map(async (tx) => this.sendTransaction(tx)));
+  }
+  create(mnemonic) {
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    return this.walletProvider.create(mnemonic);
+  }
+  generate() {
+    if (!this.walletProvider) throw new Error("No wallet provider available");
+    return this.walletProvider.generate();
+  }
+  getAddress() {
+    return this.cachedAddress;
+  }
+  getPublicKey() {
+    return this.cachedPublicKey;
   }
 };
 
@@ -1116,7 +1234,7 @@ var NativeTokenNear = {
   decimals: 24,
   logoUrl: "https://joai.ai/images/tokens/near-black.svg"
 };
-var getNearAdapter = createNearAdapter("near", {
+var NearAdapter = createNearAdapter("near", {
   mainnet: {
     name: "near",
     displayName: "NEAR Mainnet",
@@ -1153,6 +1271,7 @@ var getNearAdapter = createNearAdapter("near", {
   ExplorerUrls,
   KnownTokens,
   NativeTokenNear,
+  NearAdapter,
   NearExplorerMap,
   NearExplorerNames,
   NearExplorerUrls,
@@ -1166,7 +1285,6 @@ var getNearAdapter = createNearAdapter("near", {
   WarpNearSerializer,
   WarpNearWallet,
   findKnownTokenById,
-  getKnownTokensForChain,
-  getNearAdapter
+  getKnownTokensForChain
 });
 //# sourceMappingURL=index.js.map