xflows 1.3.1 → 1.3.3

package/dist/index.js

@@ -18684,7 +18684,7 @@ import * as readline from "readline";
 // package.json
 var package_default = {
   name: "xflows",
-  version: "1.3.1",
+  version: "1.3.3",
   description: "CLI tool for Wanchain XFlows cross-chain bridge - wallet management, quote queries, and cross-chain transactions",
   type: "module",
   bin: {
@@ -19193,13 +19193,19 @@ program2.command("send").description(`Build and send a cross-chain transaction
     if (quote.nativeFees?.length) {
       console.log(`Native fees:`);
       for (const f2 of quote.nativeFees) {
-        console.log(`  ${f2.amount} ${f2.symbol}`);
+        const amount = f2.nativeFeeAmount ?? f2.amount;
+        const symbol = f2.nativeFeeSymbol ?? f2.symbol;
+        const decimals = f2.nativeFeeDecimals ?? f2.decimals ?? 18;
+        console.log(`  ${formatUnits(amount, decimals)} ${symbol}`);
       }
     }
     if (quote.tokenFees?.length) {
       console.log(`Token fees:`);
       for (const f2 of quote.tokenFees) {
-        console.log(`  ${f2.amount} ${f2.symbol}`);
+        const amount = f2.tokenFeeAmount ?? f2.amount;
+        const symbol = f2.tokenFeeSymbol ?? f2.symbol;
+        const decimals = f2.tokenFeeDecimals ?? f2.decimals ?? 18;
+        console.log(`  ${formatUnits(amount, decimals)} ${symbol}`);
       }
     }
     console.log(`
@@ -19218,25 +19224,26 @@ Building transaction...`);
       process.exit(1);
     }
     const NATIVE_ADDRESS = "0x0000000000000000000000000000000000000000";
-    if (opts.fromToken.toLowerCase() !== NATIVE_ADDRESS && tx.approvalAddress) {
+    const spender = tx.approvalAddress || tx.to;
+    if (opts.fromToken.toLowerCase() !== NATIVE_ADDRESS && spender) {
       console.log(`
-Checking token approval for ${tx.approvalAddress}...`);
+Checking token approval for ${spender}...`);
       const tokenContract = new Contract(opts.fromToken, ERC20_ABI, signer);
-      const currentAllowance = await tokenContract.allowance(wallet.address, tx.approvalAddress);
+      const currentAllowance = await tokenContract.allowance(wallet.address, spender);
       const decimals = await tokenContract.decimals();
       const requiredAmount = parseUnits(opts.amount, decimals);
       if (currentAllowance < requiredAmount) {
-        console.log(`Approving ${opts.amount} tokens for ${tx.approvalAddress}...`);
+        console.log(`Approving ${opts.amount} tokens for ${spender}...`);
         try {
-          await tokenContract.approve.estimateGas(tx.approvalAddress, requiredAmount);
+          await tokenContract.approve.estimateGas(spender, requiredAmount);
         } catch {
           console.log("Approve estimate failed, resetting allowance to 0 first...");
-          const resetTx = await tokenContract.approve(tx.approvalAddress, 0n);
+          const resetTx = await tokenContract.approve(spender, 0n);
           console.log(`Reset tx: ${resetTx.hash}`);
           await resetTx.wait();
           console.log("Allowance reset to 0.");
         }
-        const approveTx = await tokenContract.approve(tx.approvalAddress, requiredAmount);
+        const approveTx = await tokenContract.approve(spender, requiredAmount);
         console.log(`Approval tx: ${approveTx.hash}`);
         await approveTx.wait();
         console.log("Approval confirmed.");
@@ -19272,7 +19279,24 @@ Checking token approval for ${tx.approvalAddress}...`);
       return;
     }
     console.log(`
-Sending transaction...`);
+Estimating gas...`);
+    try {
+      const estimatedGas = await provider.estimateGas({
+        ...txRequest,
+        from: wallet.address
+      });
+      if (!txRequest.gasLimit) {
+        txRequest.gasLimit = estimatedGas * 120n / 100n;
+      }
+      console.log(`Estimated gas: ${estimatedGas.toString()}`);
+    } catch (err) {
+      const reason = err.reason || err.shortMessage || err.message;
+      console.error(`
+Transaction will fail: ${reason}`);
+      console.error("The transaction was NOT sent.");
+      process.exit(1);
+    }
+    console.log("Sending transaction...");
     const sentTx = await signer.sendTransaction(txRequest);
     console.log(`Transaction hash: ${sentTx.hash}`);
     console.log("Waiting for confirmation...");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xflows",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "CLI tool for Wanchain XFlows cross-chain bridge - wallet management, quote queries, and cross-chain transactions",
   "type": "module",
   "bin": {