xflows 1.3.0 → 1.3.2

package/dist/index.js

@@ -5,25 +5,43 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
@@ -17626,7 +17644,6 @@ class Mnemonic {
     return false;
   }
 }
-
 // node_modules/aes-js/lib.esm/aes.js
 /*! MIT License. Copyright 2015-2022 Richard Moore <me@ricmoo.com>. See LICENSE.txt. */
 var __classPrivateFieldGet = function(receiver, state, kind, f2) {
@@ -18667,7 +18684,7 @@ import * as readline from "readline";
 // package.json
 var package_default = {
   name: "xflows",
-  version: "1.3.0",
+  version: "1.3.2",
   description: "CLI tool for Wanchain XFlows cross-chain bridge - wallet management, quote queries, and cross-chain transactions",
   type: "module",
   bin: {
@@ -19201,16 +19218,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 requiredAmount = BigInt(tx.value || 0) > 0n ? BigInt(tx.value) : parseUnits(opts.amount, 18);
+      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 token spend...");
-        const maxApproval = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-        const approveTx = await tokenContract.approve(tx.approvalAddress, maxApproval);
+        console.log(`Approving ${opts.amount} tokens for ${spender}...`);
+        try {
+          await tokenContract.approve.estimateGas(spender, requiredAmount);
+        } catch {
+          console.log("Approve estimate failed, resetting allowance to 0 first...");
+          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(spender, requiredAmount);
         console.log(`Approval tx: ${approveTx.hash}`);
         await approveTx.wait();
         console.log("Approval confirmed.");

package/package.json

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