@vleap/warps-adapter-evm 0.2.0-alpha.32 → 0.2.0-alpha.34

package/dist/index.d.cts

@@ -205,10 +205,12 @@ declare class WarpEvmResults implements AdapterWarpResults {
     private readonly serializer;
     private readonly provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
-    getTransactionExecutionResults(warp: Warp, tx: ethers.TransactionReceipt): Promise<WarpExecution>;
+    getTransactionExecutionResults(warp: Warp, tx: ethers.TransactionReceipt | null): Promise<WarpExecution>;
     extractQueryResults(warp: Warp, typedValues: any[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
-        values: any[];
-        valuesRaw: any[];
+        values: {
+            string: string[];
+            native: any[];
+        };
         results: WarpExecutionResults;
     }>;
     getTransactionStatus(txHash: string): Promise<{
@@ -233,7 +235,6 @@ 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>;
@@ -250,6 +251,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

@@ -205,10 +205,12 @@ declare class WarpEvmResults implements AdapterWarpResults {
     private readonly serializer;
     private readonly provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
-    getTransactionExecutionResults(warp: Warp, tx: ethers.TransactionReceipt): Promise<WarpExecution>;
+    getTransactionExecutionResults(warp: Warp, tx: ethers.TransactionReceipt | null): Promise<WarpExecution>;
     extractQueryResults(warp: Warp, typedValues: any[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
-        values: any[];
-        valuesRaw: any[];
+        values: {
+            string: string[];
+            native: any[];
+        };
         results: WarpExecutionResults;
     }>;
     getTransactionStatus(txHash: string): Promise<{
@@ -233,7 +235,6 @@ 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>;
@@ -250,6 +251,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

@@ -743,6 +743,20 @@ var WarpEvmResults = class {
     this.provider = new import_ethers3.ethers.JsonRpcProvider(apiUrl, network);
   }
   async getTransactionExecutionResults(warp, tx) {
+    if (!tx) {
+      return {
+        success: false,
+        warp,
+        action: 0,
+        user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
+        txHash: "",
+        tx: null,
+        next: null,
+        values: { string: [], native: [] },
+        results: {},
+        messages: {}
+      };
+    }
     const success = tx.status === 1;
     const gasUsed = tx.gasUsed?.toString() || "0";
     const gasPrice = tx.gasPrice?.toString() || "0";
@@ -750,35 +764,37 @@ var WarpEvmResults = class {
     const transactionHash = tx.hash;
     const logs = tx.logs.map((log) => ({
       address: log.address,
-      topics: log.topics,
+      topics: [...log.topics],
       data: log.data,
       blockNumber: log.blockNumber?.toString() || "0",
       transactionHash: log.transactionHash,
       index: log.index?.toString() || "0"
     }));
+    const rawValues = [transactionHash, blockNumber, gasUsed, gasPrice, ...logs.length > 0 ? logs : []];
+    const stringValues = rawValues.map((v) => String(v));
     return {
       success,
       warp,
       action: 0,
-      user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, "evm"),
+      user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
       txHash: transactionHash,
       tx,
       next: null,
-      values: [transactionHash, blockNumber, gasUsed, gasPrice, ...logs.length > 0 ? logs : []],
-      valuesRaw: [transactionHash, blockNumber, gasUsed, gasPrice, ...logs.length > 0 ? logs : []],
+      values: { string: stringValues, native: rawValues },
       results: {},
       messages: {}
     };
   }
   async extractQueryResults(warp, typedValues, actionIndex, inputs) {
-    const values = typedValues.map((t) => this.serializer.typedToString(t));
-    const valuesRaw = typedValues.map((t) => this.serializer.typedToNative(t)[1]);
+    const stringValues = typedValues.map((t) => this.serializer.typedToString(t));
+    const nativeValues = typedValues.map((t) => this.serializer.typedToNative(t)[1]);
+    const values = { string: stringValues, native: nativeValues };
     let results = {};
-    if (!warp.results) return { values, valuesRaw, results };
+    if (!warp.results) return { values, results };
     const getNestedValue = (path) => {
       const indices = path.split(".").slice(1).map((i) => parseInt(i) - 1);
       if (indices.length === 0) return void 0;
-      let value = valuesRaw[indices[0]];
+      let value = nativeValues[indices[0]];
       for (let i = 1; i < indices.length; i++) {
         if (value === void 0 || value === null) return void 0;
         value = value[indices[i]];
@@ -798,7 +814,7 @@ var WarpEvmResults = class {
         results[key] = path;
       }
     }
-    return { values, valuesRaw, results: await (0, import_warps9.evaluateResultsCommon)(warp, results, actionIndex, inputs, this.serializer.coreSerializer) };
+    return { values, results: await (0, import_warps9.evaluateResultsCommon)(warp, results, actionIndex, inputs, this.serializer.coreSerializer) };
   }
   async getTransactionStatus(txHash) {
     try {
@@ -953,7 +969,7 @@ var WarpEvmExecutor = class {
       });
       const decodedResult = iface.decodeFunctionResult(action.func, result);
       const isSuccess = true;
-      const { values, valuesRaw, results } = await this.results.extractQueryResults(
+      const { values, results } = await this.results.extractQueryResults(
         executable.warp,
         decodedResult,
         executable.action,
@@ -969,7 +985,6 @@ var WarpEvmExecutor = class {
         tx: null,
         next,
         values,
-        valuesRaw,
         results,
         messages: (0, import_warps10.applyResultsToMessages)(executable.warp, results)
       };
@@ -982,8 +997,7 @@ var WarpEvmExecutor = class {
         txHash: null,
         tx: null,
         next: null,
-        values: [],
-        valuesRaw: [],
+        values: { string: [], native: [] },
         results: {},
         messages: {}
       };
@@ -1189,16 +1203,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,
@@ -1213,22 +1223,17 @@ var WarpEvmWallet = class {
     return { ...tx, signature: signedTx };
   }
   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;
   }
   create(mnemonic) {
@@ -1240,11 +1245,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