@kimafinance/kima-transaction-widget 1.5.23 → 1.5.24

package/dist/index.cjs

@@ -6504,43 +6504,64 @@ var useTrc20Allowance = () => {
     (0, import_react_redux20.useSelector)(selectNetworkOption)
   );
   const poolAddress = (0, import_react28.useMemo)(() => getPoolAddress(pools, "TRX"), [pools]);
+  const tokenAddressTrimmed = (0, import_react28.useMemo)(
+    () => tokenAddress?.trim(),
+    [tokenAddress]
+  );
+  const poolAddressTrimmed = (0, import_react28.useMemo)(
+    () => poolAddress?.trim(),
+    [poolAddress]
+  );
   const isOwnerValid = !!address && !!tronWeb?.isAddress?.(address);
-  const enabled = isOwnerValid && !!tokenAddress && !!poolAddress && !!tronWeb && sourceChain.shortName === "TRX";
+  const isTokenValid = !!tokenAddressTrimmed && !!tronWeb?.isAddress?.(tokenAddressTrimmed);
+  const isPoolValid = !!poolAddressTrimmed && !!tronWeb?.isAddress?.(poolAddressTrimmed);
+  const enabled = isOwnerValid && isTokenValid && isPoolValid && !!tronWeb && sourceChain.shortName === "TRX";
   (0, import_react28.useEffect)(() => {
     logger_default.debug("[useTrc20Allowance] init", {
       mode,
       sourceChain: sourceChain?.shortName,
       address,
-      tokenAddress,
-      poolAddress,
+      tokenAddress: tokenAddressTrimmed,
+      poolAddress: poolAddressTrimmed,
       hasTronWeb: !!tronWeb,
       isOwnerValid,
+      isTokenValid,
+      isPoolValid,
       enabled
     });
   }, [
     mode,
     sourceChain?.shortName,
     address,
-    tokenAddress,
-    poolAddress,
+    tokenAddressTrimmed,
+    poolAddressTrimmed,
     tronWeb,
     isOwnerValid,
+    isTokenValid,
+    isPoolValid,
     enabled
   ]);
   const q = (0, import_react_query12.useQuery)({
-    queryKey: ["tronAllowance", address, tokenAddress, poolAddress],
+    queryKey: [
+      "tronAllowance",
+      address,
+      tokenAddressTrimmed,
+      poolAddressTrimmed
+    ],
     enabled,
     staleTime: 6e4,
     refetchInterval: 6e4,
     queryFn: async () => {
       logger_default.debug("[useTrc20Allowance] queryFn:start", {
         owner: address,
-        tokenAddress,
-        poolAddress,
+        tokenAddress: tokenAddressTrimmed,
+        poolAddress: poolAddressTrimmed,
         defaultAddress: tronWeb?.defaultAddress
       });
       try {
         const ownerBase58 = address;
+        const tokenBase58 = tokenAddressTrimmed;
+        const poolBase58 = poolAddressTrimmed;
         try {
           const cur = tronWeb.defaultAddress?.base58;
           if (!cur || cur !== ownerBase58) {
@@ -6554,25 +6575,28 @@ var useTrc20Allowance = () => {
           logger_default.warn("[useTrc20Allowance] setAddress failed (non-fatal)", e);
         }
         const isOwner = tronWeb.isAddress(ownerBase58);
-        const isToken = tronWeb.isAddress(tokenAddress);
-        const isPool = tronWeb.isAddress(poolAddress);
+        const isToken = tronWeb.isAddress(tokenBase58);
+        const isPool = tronWeb.isAddress(poolBase58);
         logger_default.debug("[useTrc20Allowance] address checks", {
           isOwner,
           isToken,
           isPool
         });
+        if (!isOwner || !isToken || !isPool) {
+          throw new Error("Invalid Tron address for allowance lookup");
+        }
         let tokenHex;
         let ownerHex;
         let poolHex;
         try {
-          tokenHex = tronWeb.address.toHex(tokenAddress);
+          tokenHex = tronWeb.address.toHex(tokenBase58);
           ownerHex = tronWeb.address.toHex(ownerBase58);
-          poolHex = tronWeb.address.toHex(poolAddress);
+          poolHex = tronWeb.address.toHex(poolBase58);
         } catch (hexErr) {
           logger_default.error("[useTrc20Allowance] toHex error", {
             ownerBase58,
-            tokenAddress,
-            poolAddress,
+            tokenAddress: tokenBase58,
+            poolAddress: poolBase58,
             hexErr
           });
           throw hexErr;
@@ -6635,6 +6659,14 @@ var useApproveTrc20 = () => {
     (0, import_react_redux21.useSelector)(selectNetworkOption)
   );
   const poolAddress = (0, import_react29.useMemo)(() => getPoolAddress(pools, "TRX"), [pools]);
+  const tokenAddressTrimmed = (0, import_react29.useMemo)(
+    () => tokenAddress?.trim(),
+    [tokenAddress]
+  );
+  const poolAddressTrimmed = (0, import_react29.useMemo)(
+    () => poolAddress?.trim(),
+    [poolAddress]
+  );
   const { data } = useTrc20Allowance();
   const approve = (0, import_react29.useCallback)(
     async (isCancel = false) => {
@@ -6648,12 +6680,12 @@ var useApproveTrc20 = () => {
         hasTronWeb: !!tronWeb
       });
       try {
-        if (!tronWeb || !address || !tokenAddress || !poolAddress || sourceChain.shortName !== "TRX") {
+        if (!tronWeb || !address || !tokenAddressTrimmed || !poolAddressTrimmed || sourceChain.shortName !== "TRX") {
           logger_default.warn("[useApproveTrc20] missing prerequisites", {
             hasTronWeb: !!tronWeb,
             address,
-            tokenAddress,
-            poolAddress,
+            tokenAddress: tokenAddressTrimmed,
+            poolAddress: poolAddressTrimmed,
             source: sourceChain?.shortName
           });
           return;
@@ -6663,11 +6695,25 @@ var useApproveTrc20 = () => {
           logger_default.error("[useApproveTrc20] " + msg, { address });
           throw new Error(msg);
         }
+        if (!tronWeb.isAddress(tokenAddressTrimmed)) {
+          const msg = "Invalid Tron token address";
+          logger_default.error("[useApproveTrc20] " + msg, {
+            tokenAddress: tokenAddressTrimmed
+          });
+          throw new Error(msg);
+        }
+        if (!tronWeb.isAddress(poolAddressTrimmed)) {
+          const msg = "Invalid Tron pool address";
+          logger_default.error("[useApproveTrc20] " + msg, {
+            poolAddress: poolAddressTrimmed
+          });
+          throw new Error(msg);
+        }
         const amount = isCancel ? "0" : allowanceNeeded.toString();
         logger_default.info("[useApproveTrc20] approve amount", { amount });
         const ownerHex = tronWeb.address.toHex(address);
-        const tokenHex = tronWeb.address.toHex(tokenAddress);
-        const poolHex = tronWeb.address.toHex(poolAddress);
+        const tokenHex = tronWeb.address.toHex(tokenAddressTrimmed);
+        const poolHex = tronWeb.address.toHex(poolAddressTrimmed);
         logger_default.debug("[useApproveTrc20] hex", { ownerHex, tokenHex, poolHex });
         const txResp = await tronWeb.transactionBuilder.triggerSmartContract(
           tokenHex,
@@ -6716,8 +6762,8 @@ var useApproveTrc20 = () => {
       tronWeb,
       signTransaction,
       address,
-      tokenAddress,
-      poolAddress,
+      tokenAddressTrimmed,
+      poolAddressTrimmed,
       allowanceNeeded,
       sourceChain?.shortName,
       qc