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

package/dist/index.mjs

@@ -713,6 +713,20 @@ var WarpEvmResults = class {
     this.provider = new ethers3.JsonRpcProvider(apiUrl, network);
   }
   async getTransactionExecutionResults(warp, tx) {
+    if (!tx) {
+      return {
+        success: false,
+        warp,
+        action: 0,
+        user: 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";
@@ -720,35 +734,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: getWarpWalletAddressFromConfig(this.config, "evm"),
+      user: 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]];
@@ -768,7 +784,7 @@ var WarpEvmResults = class {
         results[key] = path;
       }
     }
-    return { values, valuesRaw, results: await evaluateResultsCommon(warp, results, actionIndex, inputs, this.serializer.coreSerializer) };
+    return { values, results: await evaluateResultsCommon(warp, results, actionIndex, inputs, this.serializer.coreSerializer) };
   }
   async getTransactionStatus(txHash) {
     try {
@@ -923,7 +939,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,
@@ -939,7 +955,6 @@ var WarpEvmExecutor = class {
         tx: null,
         next,
         values,
-        valuesRaw,
         results,
         messages: applyResultsToMessages(executable.warp, results)
       };
@@ -952,8 +967,7 @@ var WarpEvmExecutor = class {
         txHash: null,
         tx: null,
         next: null,
-        values: [],
-        valuesRaw: [],
+        values: { string: [], native: [] },
         results: {},
         messages: {}
       };
@@ -1153,22 +1167,22 @@ var WarpEvmExplorer = class {
 };
 
 // src/WarpEvmWallet.ts
-import { getWarpWalletPrivateKeyFromConfig } from "@vleap/warps";
+import {
+  getProviderUrl as getProviderUrl4,
+  getWarpWalletMnemonicFromConfig,
+  getWarpWalletPrivateKeyFromConfig
+} from "@vleap/warps";
 import { ethers as ethers5 } from "ethers";
 var WarpEvmWallet = class {
   constructor(config, chain) {
     this.config = config;
     this.chain = chain;
-    this.wallet = null;
-    this.provider = new ethers5.JsonRpcProvider(chain.defaultApiUrl || "https://rpc.sepolia.org");
+    const apiUrl = getProviderUrl4(config, chain.name, config.env, chain.defaultApiUrl);
+    this.provider = new ethers5.JsonRpcProvider(apiUrl);
   }
   async signTransaction(tx) {
-    if (!tx || typeof tx !== "object") {
-      throw new Error("Invalid transaction object");
-    }
-    const privateKey = getWarpWalletPrivateKeyFromConfig(this.config, this.chain.name);
-    if (!privateKey) throw new Error("Wallet not initialized - no private key provided");
-    const wallet = new ethers5.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,
@@ -1183,22 +1197,17 @@ var WarpEvmWallet = class {
     return { ...tx, signature: signedTx };
   }
   async signMessage(message) {
-    const privateKey = getWarpWalletPrivateKeyFromConfig(this.config, this.chain.name);
-    if (!privateKey) throw new Error("Wallet not initialized - no private key provided");
-    const wallet = new ethers5.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 = getWarpWalletPrivateKeyFromConfig(this.config, this.chain.name);
-    if (!privateKey) throw new Error("Wallet not initialized - no private key provided");
-    const wallet = new ethers5.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) {
@@ -1210,11 +1219,16 @@ var WarpEvmWallet = class {
     return { address: wallet.address, privateKey: wallet.privateKey, mnemonic: wallet.mnemonic?.phrase || "" };
   }
   getAddress() {
-    const privateKey = getWarpWalletPrivateKeyFromConfig(this.config, this.chain.name);
-    if (!privateKey) return null;
-    const wallet = new ethers5.Wallet(privateKey);
+    const wallet = this.getWallet();
     return wallet.address;
   }
+  getWallet() {
+    const privateKey = getWarpWalletPrivateKeyFromConfig(this.config, this.chain.name);
+    if (privateKey) return new ethers5.Wallet(privateKey);
+    const mnemonic = getWarpWalletMnemonicFromConfig(this.config, this.chain.name);
+    if (mnemonic) return ethers5.Wallet.fromPhrase(mnemonic);
+    throw new Error("No private key or mnemonic provided");
+  }
 };
 
 // src/chains/common.ts