@vleap/warps-adapter-evm 0.2.0-alpha.33 → 0.2.0-alpha.35

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpExecution, AdapterWarpExplorer, AdapterWarpResults, Warp, ResolvedInput, WarpExecutionResults, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, WarpNativeValue, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
+import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecution, AdapterWarpExplorer, AdapterWarpResults, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionResults, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
 import { ethers } from 'ethers';
 
 declare const NativeTokenArb: WarpChainAsset;
@@ -172,9 +172,8 @@ declare class WarpEvmExecutor implements AdapterWarpExecutor {
     createContractCallTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     private createTokenTransferTransaction;
     private createSingleTokenTransfer;
-    executeQuery(executable: WarpExecutable): Promise<WarpExecution>;
+    executeQuery(executable: WarpExecutable): Promise<WarpActionExecution>;
     private estimateGasAndSetDefaults;
-    signMessage(message: string, privateKey: string): Promise<string>;
     verifyMessage(message: string, signature: string): Promise<string>;
 }
 
@@ -205,11 +204,14 @@ declare class WarpEvmResults implements AdapterWarpResults {
     private readonly serializer;
     private readonly provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
-    getTransactionExecutionResults(warp: Warp, tx: ethers.TransactionReceipt): Promise<WarpExecution>;
-    extractQueryResults(warp: Warp, typedValues: any[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
+    getActionExecution(warp: Warp, actionIndex: WarpActionIndex, tx: WarpAdapterGenericRemoteTransaction): Promise<WarpActionExecution>;
+    private createFailedExecution;
+    private handleWarpChainAction;
+    private handleTransactionReceipt;
+    extractQueryResults(warp: Warp, typedValues: unknown[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
         values: {
             string: string[];
-            native: any[];
+            native: WarpNativeValue[];
         };
         results: WarpExecutionResults;
     }>;
@@ -235,12 +237,13 @@ declare class WarpEvmSerializer implements AdapterWarpSerializer {
 declare class WarpEvmWallet implements AdapterWarpWallet {
     private config;
     private chain;
-    private wallet;
     private provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
     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;
@@ -252,6 +255,7 @@ declare class WarpEvmWallet implements AdapterWarpWallet {
         mnemonic: string;
     };
     getAddress(): string | null;
+    private getWallet;
 }
 
 export { ArbitrumExplorers, BaseExplorers, EthereumExplorers, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, UniswapService, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmResults, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getArbitrumAdapter, getBaseAdapter, getEthereumAdapter, getKnownTokensForChain };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpExecution, AdapterWarpExplorer, AdapterWarpResults, Warp, ResolvedInput, WarpExecutionResults, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, WarpNativeValue, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
+import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecution, AdapterWarpExplorer, AdapterWarpResults, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionResults, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
 import { ethers } from 'ethers';
 
 declare const NativeTokenArb: WarpChainAsset;
@@ -172,9 +172,8 @@ declare class WarpEvmExecutor implements AdapterWarpExecutor {
     createContractCallTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     private createTokenTransferTransaction;
     private createSingleTokenTransfer;
-    executeQuery(executable: WarpExecutable): Promise<WarpExecution>;
+    executeQuery(executable: WarpExecutable): Promise<WarpActionExecution>;
     private estimateGasAndSetDefaults;
-    signMessage(message: string, privateKey: string): Promise<string>;
     verifyMessage(message: string, signature: string): Promise<string>;
 }
 
@@ -205,11 +204,14 @@ declare class WarpEvmResults implements AdapterWarpResults {
     private readonly serializer;
     private readonly provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
-    getTransactionExecutionResults(warp: Warp, tx: ethers.TransactionReceipt): Promise<WarpExecution>;
-    extractQueryResults(warp: Warp, typedValues: any[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
+    getActionExecution(warp: Warp, actionIndex: WarpActionIndex, tx: WarpAdapterGenericRemoteTransaction): Promise<WarpActionExecution>;
+    private createFailedExecution;
+    private handleWarpChainAction;
+    private handleTransactionReceipt;
+    extractQueryResults(warp: Warp, typedValues: unknown[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
         values: {
             string: string[];
-            native: any[];
+            native: WarpNativeValue[];
         };
         results: WarpExecutionResults;
     }>;
@@ -235,12 +237,13 @@ declare class WarpEvmSerializer implements AdapterWarpSerializer {
 declare class WarpEvmWallet implements AdapterWarpWallet {
     private config;
     private chain;
-    private wallet;
     private provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
     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;
@@ -252,6 +255,7 @@ declare class WarpEvmWallet implements AdapterWarpWallet {
         mnemonic: string;
     };
     getAddress(): string | null;
+    private getWallet;
 }
 
 export { ArbitrumExplorers, BaseExplorers, EthereumExplorers, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, UniswapService, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmResults, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getArbitrumAdapter, getBaseAdapter, getEthereumAdapter, getKnownTokensForChain };

package/dist/index.js

@@ -426,7 +426,10 @@ var WarpEvmDataLoader = class {
     try {
       const tx = await this.provider.getTransaction(identifier);
       if (!tx) return null;
-      const receipt = await this.provider.getTransactionReceipt(identifier);
+      let receipt = await this.provider.getTransactionReceipt(identifier);
+      if (awaitCompleted && !receipt) {
+        receipt = await tx.wait();
+      }
       const block = await this.provider.getBlock(tx.blockNumber || "latest");
       return {
         chain: this.chain.name,
@@ -742,7 +745,51 @@ var WarpEvmResults = class {
     const network = new import_ethers3.ethers.Network(this.chain.name, parseInt(this.chain.chainId));
     this.provider = new import_ethers3.ethers.JsonRpcProvider(apiUrl, network);
   }
-  async getTransactionExecutionResults(warp, tx) {
+  async getActionExecution(warp, actionIndex, tx) {
+    if (!tx) {
+      return this.createFailedExecution(warp, actionIndex);
+    }
+    if ("status" in tx && typeof tx.status === "string") {
+      return this.handleWarpChainAction(warp, actionIndex, tx);
+    }
+    return this.handleTransactionReceipt(warp, actionIndex, tx);
+  }
+  createFailedExecution(warp, actionIndex) {
+    return {
+      success: false,
+      warp,
+      action: actionIndex,
+      user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
+      txHash: "",
+      tx: null,
+      next: null,
+      values: { string: [], native: [] },
+      results: {},
+      messages: {}
+    };
+  }
+  handleWarpChainAction(warp, actionIndex, tx) {
+    const success = tx.status === "success";
+    const transactionHash = tx.id || tx.tx?.hash || "";
+    const gasUsed = tx.tx?.gasLimit || "0";
+    const gasPrice = tx.tx?.gasPrice || "0";
+    const blockNumber = tx.tx?.blockNumber || "0";
+    const rawValues = [transactionHash, blockNumber, gasUsed, gasPrice];
+    const stringValues = rawValues.map(String);
+    return {
+      success,
+      warp,
+      action: actionIndex,
+      user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
+      txHash: transactionHash,
+      tx,
+      next: null,
+      values: { string: stringValues, native: rawValues },
+      results: {},
+      messages: {}
+    };
+  }
+  handleTransactionReceipt(warp, actionIndex, tx) {
     const success = tx.status === 1;
     const gasUsed = tx.gasUsed?.toString() || "0";
     const gasPrice = tx.gasPrice?.toString() || "0";
@@ -757,12 +804,12 @@ var WarpEvmResults = class {
       index: log.index?.toString() || "0"
     }));
     const rawValues = [transactionHash, blockNumber, gasUsed, gasPrice, ...logs.length > 0 ? logs : []];
-    const stringValues = rawValues.map((v) => String(v));
+    const stringValues = rawValues.map(String);
     return {
       success,
       warp,
-      action: 0,
-      user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, "evm"),
+      action: actionIndex,
+      user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
       txHash: transactionHash,
       tx,
       next: null,
@@ -872,15 +919,17 @@ var WarpEvmExecutor = class {
     const userWallet = (0, import_warps10.getWarpWalletAddressFromConfig)(this.config, executable.chain.name);
     if (!userWallet) throw new Error("WarpEvmExecutor: createContractCall - user address not set");
     const action = (0, import_warps10.getWarpActionByIndex)(executable.warp, executable.action);
-    if (!action || !("func" in action) || !action.func) {
-      throw new Error("WarpEvmExecutor: Contract action must have a function name");
-    }
-    if (!import_ethers4.ethers.isAddress(executable.destination)) {
-      throw new Error(`WarpEvmExecutor: Invalid contract address: ${executable.destination}`);
-    }
+    if (!action || !("func" in action) || !action.func) throw new Error("WarpEvmExecutor: Contract action must have a function name");
+    if (!import_ethers4.ethers.isAddress(executable.destination)) throw new Error(`WarpEvmExecutor: Invalid contract address: ${executable.destination}`);
     try {
-      const iface = new import_ethers4.ethers.Interface([`function ${action.func}`]);
-      const encodedData = iface.encodeFunctionData(action.func, executable.args);
+      let iface;
+      try {
+        iface = new import_ethers4.ethers.Interface(JSON.parse(action.abi));
+      } catch {
+        iface = new import_ethers4.ethers.Interface([action.abi]);
+      }
+      const nativeArgs = executable.args.map((arg) => this.serializer.coreSerializer.stringToNative(arg)[1]);
+      const encodedData = iface.encodeFunctionData(action.func, nativeArgs);
       const tx = {
         to: executable.destination,
         value: executable.value,
@@ -892,19 +941,13 @@ var WarpEvmExecutor = class {
     }
   }
   async createTokenTransferTransaction(executable, userWallet) {
-    if (executable.transfers.length === 0) {
-      throw new Error("WarpEvmExecutor: No transfers provided");
-    }
-    if (!this.chain.nativeToken?.identifier) {
-      throw new Error("WarpEvmExecutor: No native token defined for this chain");
-    }
+    if (executable.transfers.length === 0) throw new Error("WarpEvmExecutor: No transfers provided");
+    if (!this.chain.nativeToken?.identifier) throw new Error("WarpEvmExecutor: No native token defined for this chain");
     const nativeTokenTransfers = executable.transfers.filter((transfer) => transfer.identifier === this.chain.nativeToken.identifier);
     const erc20Transfers = executable.transfers.filter((transfer) => transfer.identifier !== this.chain.nativeToken.identifier);
     if (nativeTokenTransfers.length === 1 && erc20Transfers.length === 0) {
       const transfer = nativeTokenTransfers[0];
-      if (transfer.amount <= 0n) {
-        throw new Error("WarpEvmExecutor: Native token transfer amount must be positive");
-      }
+      if (transfer.amount <= 0n) throw new Error("WarpEvmExecutor: Native token transfer amount must be positive");
       const tx = {
         to: executable.destination,
         value: transfer.amount,
@@ -915,9 +958,7 @@ var WarpEvmExecutor = class {
     if (nativeTokenTransfers.length === 0 && erc20Transfers.length === 1) {
       return this.createSingleTokenTransfer(executable, erc20Transfers[0], userWallet);
     }
-    if (executable.transfers.length > 1) {
-      throw new Error("WarpEvmExecutor: Multiple token transfers not yet supported");
-    }
+    if (executable.transfers.length > 1) throw new Error("WarpEvmExecutor: Multiple token transfers not yet supported");
     throw new Error("WarpEvmExecutor: Invalid transfer configuration");
   }
   async createSingleTokenTransfer(executable, transfer, userWallet) {
@@ -928,27 +969,25 @@ var WarpEvmExecutor = class {
     const encodedData = transferInterface.encodeFunctionData("transfer", [executable.destination, transfer.amount]);
     const tx = {
       to: transfer.identifier,
-      // Token contract address
       value: 0n,
-      // No native token value for ERC-20 transfers
       data: encodedData
     };
     return this.estimateGasAndSetDefaults(tx, userWallet);
   }
   async executeQuery(executable) {
     const action = (0, import_warps10.getWarpActionByIndex)(executable.warp, executable.action);
-    if (action.type !== "query") {
-      throw new Error(`WarpEvmExecutor: Invalid action type for executeQuery: ${action.type}`);
-    }
-    if (!action.func) {
-      throw new Error("WarpEvmExecutor: Query action must have a function name");
-    }
-    if (!import_ethers4.ethers.isAddress(executable.destination)) {
-      throw new Error(`WarpEvmExecutor: Invalid contract address for query: ${executable.destination}`);
-    }
+    if (action.type !== "query") throw new Error(`WarpEvmExecutor: Invalid action type for executeQuery: ${action.type}`);
+    if (!action.func) throw new Error("WarpEvmExecutor: Query action must have a function name");
+    if (!import_ethers4.ethers.isAddress(executable.destination)) throw new Error(`WarpEvmExecutor: Invalid address for query: ${executable.destination}`);
     try {
-      const iface = new import_ethers4.ethers.Interface([`function ${action.func}`]);
-      const encodedData = iface.encodeFunctionData(action.func, executable.args);
+      let iface;
+      try {
+        iface = new import_ethers4.ethers.Interface(JSON.parse(action.abi));
+      } catch {
+        iface = new import_ethers4.ethers.Interface([action.abi]);
+      }
+      const nativeArgs = executable.args.map((arg) => this.serializer.coreSerializer.stringToNative(arg)[1]);
+      const encodedData = iface.encodeFunctionData(action.func, nativeArgs);
       const result = await this.provider.call({
         to: executable.destination,
         data: encodedData
@@ -995,12 +1034,8 @@ var WarpEvmExecutor = class {
         ...tx,
         from
       });
-      if (gasEstimate < BigInt(WarpEvmConstants.Validation.MinGasLimit)) {
-        throw new Error(`Gas estimate too low: ${gasEstimate}`);
-      }
-      if (gasEstimate > BigInt(WarpEvmConstants.Validation.MaxGasLimit)) {
-        throw new Error(`Gas estimate too high: ${gasEstimate}`);
-      }
+      if (gasEstimate < BigInt(WarpEvmConstants.Validation.MinGasLimit)) throw new Error(`Gas estimate too low: ${gasEstimate}`);
+      if (gasEstimate > BigInt(WarpEvmConstants.Validation.MaxGasLimit)) throw new Error(`Gas estimate too high: ${gasEstimate}`);
       const feeData = await this.provider.getFeeData();
       if (feeData.maxFeePerGas && feeData.maxPriorityFeePerGas) {
         return {
@@ -1044,15 +1079,6 @@ var WarpEvmExecutor = class {
       };
     }
   }
-  async signMessage(message, privateKey) {
-    try {
-      const wallet = new import_ethers4.ethers.Wallet(privateKey);
-      const signature = await wallet.signMessage(message);
-      return signature;
-    } catch (error) {
-      throw new Error(`Failed to sign message: ${error}`);
-    }
-  }
   async verifyMessage(message, signature) {
     try {
       const recoveredAddress = import_ethers4.ethers.verifyMessage(message, signature);
@@ -1189,16 +1215,12 @@ var WarpEvmWallet = class {
   constructor(config, chain) {
     this.config = config;
     this.chain = chain;
-    this.wallet = null;
-    this.provider = new import_ethers5.ethers.JsonRpcProvider(chain.defaultApiUrl || "https://rpc.sepolia.org");
+    const apiUrl = (0, import_warps11.getProviderUrl)(config, chain.name, config.env, chain.defaultApiUrl);
+    this.provider = new import_ethers5.ethers.JsonRpcProvider(apiUrl);
   }
   async signTransaction(tx) {
-    if (!tx || typeof tx !== "object") {
-      throw new Error("Invalid transaction object");
-    }
-    const privateKey = (0, import_warps11.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
-    if (!privateKey) throw new Error("Wallet not initialized - no private key provided");
-    const wallet = new import_ethers5.ethers.Wallet(privateKey);
+    if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
+    const wallet = this.getWallet();
     const txRequest = {
       to: tx.to,
       data: tx.data,
@@ -1212,25 +1234,53 @@ var WarpEvmWallet = class {
     const signedTx = await wallet.signTransaction(txRequest);
     return { ...tx, signature: signedTx };
   }
+  async signTransactions(txs) {
+    if (txs.length === 0) return [];
+    if (txs.length > 1) {
+      const wallet = this.getWallet();
+      const address = wallet.address;
+      const currentNonce = await this.provider.getTransactionCount(address, "pending");
+      const signedTxs = [];
+      for (let i = 0; i < txs.length; i++) {
+        const tx = { ...txs[i] };
+        tx.nonce = currentNonce + i;
+        if (i > 0) {
+          const priorityReduction = BigInt(i * 1e9);
+          const minGasPrice = BigInt(1e9);
+          if (tx.maxFeePerGas && tx.maxPriorityFeePerGas) {
+            tx.maxFeePerGas = tx.maxFeePerGas > priorityReduction ? tx.maxFeePerGas - priorityReduction : minGasPrice;
+            tx.maxPriorityFeePerGas = tx.maxPriorityFeePerGas > priorityReduction ? tx.maxPriorityFeePerGas - priorityReduction : minGasPrice;
+            delete tx.gasPrice;
+          } else if (tx.gasPrice) {
+            tx.gasPrice = tx.gasPrice > priorityReduction ? tx.gasPrice - priorityReduction : minGasPrice;
+            delete tx.maxFeePerGas;
+            delete tx.maxPriorityFeePerGas;
+          }
+        }
+        const signedTx = await this.signTransaction(tx);
+        signedTxs.push(signedTx);
+      }
+      return signedTxs;
+    }
+    return Promise.all(txs.map(async (tx) => this.signTransaction(tx)));
+  }
   async signMessage(message) {
-    const privateKey = (0, import_warps11.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
-    if (!privateKey) throw new Error("Wallet not initialized - no private key provided");
-    const wallet = new import_ethers5.ethers.Wallet(privateKey);
-    return await wallet.signMessage(message);
+    const wallet = this.getWallet();
+    const signature = await wallet.signMessage(message);
+    return signature;
   }
   async sendTransaction(tx) {
-    if (!tx || typeof tx !== "object") {
-      throw new Error("Invalid transaction object");
-    }
-    if (!tx.signature) {
-      throw new Error("Transaction must be signed before sending");
-    }
-    const privateKey = (0, import_warps11.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
-    if (!privateKey) throw new Error("Wallet not initialized - no private key provided");
-    const wallet = new import_ethers5.ethers.Wallet(privateKey).connect(this.provider);
-    const txResponse = await wallet.sendTransaction(tx);
+    if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
+    if (!tx.signature) throw new Error("Transaction must be signed before sending");
+    const wallet = this.getWallet();
+    if (!wallet) throw new Error("Wallet not initialized - no private key provided");
+    const connectedWallet = wallet.connect(this.provider);
+    const txResponse = await connectedWallet.sendTransaction(tx);
     return txResponse.hash;
   }
+  async sendTransactions(txs) {
+    return Promise.all(txs.map(async (tx) => this.sendTransaction(tx)));
+  }
   create(mnemonic) {
     const wallet = import_ethers5.ethers.Wallet.fromPhrase(mnemonic);
     return { address: wallet.address, privateKey: wallet.privateKey, mnemonic };
@@ -1240,11 +1290,16 @@ var WarpEvmWallet = class {
     return { address: wallet.address, privateKey: wallet.privateKey, mnemonic: wallet.mnemonic?.phrase || "" };
   }
   getAddress() {
-    const privateKey = (0, import_warps11.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
-    if (!privateKey) return null;
-    const wallet = new import_ethers5.ethers.Wallet(privateKey);
+    const wallet = this.getWallet();
     return wallet.address;
   }
+  getWallet() {
+    const privateKey = (0, import_warps11.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
+    if (privateKey) return new import_ethers5.ethers.Wallet(privateKey);
+    const mnemonic = (0, import_warps11.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
+    if (mnemonic) return import_ethers5.ethers.Wallet.fromPhrase(mnemonic);
+    throw new Error("No private key or mnemonic provided");
+  }
 };
 
 // src/chains/common.ts