@kimafinance/kima-transaction-widget 1.0.8 → 1.1.0

package/dist/index.modern.js

@@ -1054,8 +1054,12 @@ function useNetworkOptions() {
   useEffect(() => {
     if (!nodeProviderQuery) return;
     (async function () {
-      const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/getChains`);
-      setOptions(networkOptions.filter(network => networks.Chains.findIndex(id => id === network.id) >= 0));
+      try {
+        const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/getChains`);
+        setOptions(networkOptions.filter(network => networks.Chains.findIndex(id => id === network.id) >= 0));
+      } catch (e) {
+        console.log('rpc disconnected', e);
+      }
     })();
   }, [nodeProviderQuery]);
   return useMemo(() => ({
@@ -1091,18 +1095,26 @@ const Network = ({
   useEffect(() => {
     if (!nodeProviderQuery || mode !== ModeOptions.bridge) return;
     (async function () {
-      const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${originNetwork}`);
-      setAvailableNetworks(networks.Chains);
-      if (_isOriginChain) {
-        dispatch(setTargetNetwork(networks.Chains[0]));
+      try {
+        const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${originNetwork}`);
+        setAvailableNetworks(networks.Chains);
+        if (_isOriginChain) {
+          dispatch(setTargetNetwork(networks.Chains[0]));
+        }
+      } catch (e) {
+        console.log('rpc disconnected', e);
       }
     })();
   }, [nodeProviderQuery, originNetwork, mode, _isOriginChain]);
   useEffect(() => {
     if (!nodeProviderQuery || mode !== ModeOptions.payment) return;
     (async function () {
-      const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${targetNetwork}`);
-      setAvailableNetworks(networks.Chains);
+      try {
+        const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${targetNetwork}`);
+        setAvailableNetworks(networks.Chains);
+      } catch (e) {
+        console.log('rpc disconnected', e);
+      }
     })();
   }, [nodeProviderQuery, mode]);
   useEffect(() => {
@@ -1884,18 +1896,26 @@ const NetworkDropdown = ({
   useEffect(() => {
     if (!nodeProviderQuery || mode !== ModeOptions.bridge) return;
     (async function () {
-      const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${originNetwork}`);
-      setAvailableNetworks(networks.Chains);
-      if (_isOriginChain) {
-        dispatch(setTargetNetwork(networks.Chains[0]));
+      try {
+        const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${originNetwork}`);
+        setAvailableNetworks(networks.Chains);
+        if (_isOriginChain) {
+          dispatch(setTargetNetwork(networks.Chains[0]));
+        }
+      } catch (e) {
+        console.log('rpc disconnected', e);
       }
     })();
   }, [nodeProviderQuery, originNetwork, mode, _isOriginChain]);
   useEffect(() => {
     if (!nodeProviderQuery || mode !== ModeOptions.payment) return;
     (async function () {
-      const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${targetNetwork}`);
-      setAvailableNetworks(networks.Chains);
+      try {
+        const networks = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${targetNetwork}`);
+        setAvailableNetworks(networks.Chains);
+      } catch (e) {
+        console.log('rpc disconnected', e);
+      }
     })();
   }, [nodeProviderQuery, mode]);
   return React.createElement("div", {
@@ -2191,57 +2211,61 @@ const TransactionWidget = ({
   useEffect(() => {
     if (!nodeProviderQuery || txId < 0) return;
     const timerId = setInterval(async () => {
-      const result = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/transaction_data/${txId}`);
-      const data = result === null || result === void 0 ? void 0 : result.transactionData;
-      if (!data) return;
-      const status = data.status;
-      console.log(status);
-      setData({
-        sourceChain: data.originChain,
-        targetChain: data.targetChain,
-        tssPullHash: data.tssPullHash,
-        tssReleaseHash: data.tssReleaseHash,
-        amount: +data.amount,
-        symbol: data.symbol,
-        kimaTxHash: data.kimaTxHash
-      });
-      setErrorStep(-1);
-      if (status === TransactionStatus.AVAILABLE) {
-        setStep(1);
-        setPercent(25);
-        setLoadingStep(1);
-      } else if (status === TransactionStatus.CONFIRMED) {
-        setStep(2);
-        setPercent(50);
-        setLoadingStep(2);
-      } else if (status.startsWith(TransactionStatus.UNAVAILABLE)) {
-        setStep(1);
-        setPercent(25);
-        setErrorStep(1);
-        setLoadingStep(-1);
-      } else if (status === TransactionStatus.KEYSIGNED) {
-        setStep(3);
-        setPercent(75);
-        setLoadingStep(3);
-      } else if (status === TransactionStatus.PAID) {
-        setStep(3);
-        setPercent(90);
-        setLoadingStep(3);
-      } else if (status === TransactionStatus.FAILED) {
-        setStep(3);
-        setPercent(90);
-        setErrorStep(3);
-        setLoadingStep(-1);
-      } else if (status === TransactionStatus.COMPLETED) {
-        setStep(4);
-        setPercent(100);
-        clearInterval(timerId);
-        setLoadingStep(-1);
-        setTimeout(() => {
-          successHandler({
-            txId
-          });
-        }, 3000);
+      try {
+        const result = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/transaction_data/${txId}`);
+        const data = result === null || result === void 0 ? void 0 : result.transactionData;
+        if (!data) return;
+        const status = data.status;
+        console.log(status);
+        setData({
+          sourceChain: data.originChain,
+          targetChain: data.targetChain,
+          tssPullHash: data.tssPullHash,
+          tssReleaseHash: data.tssReleaseHash,
+          amount: +data.amount,
+          symbol: data.symbol,
+          kimaTxHash: data.kimaTxHash
+        });
+        setErrorStep(-1);
+        if (status === TransactionStatus.AVAILABLE) {
+          setStep(1);
+          setPercent(25);
+          setLoadingStep(1);
+        } else if (status === TransactionStatus.CONFIRMED) {
+          setStep(2);
+          setPercent(50);
+          setLoadingStep(2);
+        } else if (status.startsWith(TransactionStatus.UNAVAILABLE)) {
+          setStep(1);
+          setPercent(25);
+          setErrorStep(1);
+          setLoadingStep(-1);
+        } else if (status === TransactionStatus.KEYSIGNED) {
+          setStep(3);
+          setPercent(75);
+          setLoadingStep(3);
+        } else if (status === TransactionStatus.PAID) {
+          setStep(3);
+          setPercent(90);
+          setLoadingStep(3);
+        } else if (status === TransactionStatus.FAILED) {
+          setStep(3);
+          setPercent(90);
+          setErrorStep(3);
+          setLoadingStep(-1);
+        } else if (status === TransactionStatus.COMPLETED) {
+          setStep(4);
+          setPercent(100);
+          clearInterval(timerId);
+          setLoadingStep(-1);
+          setTimeout(() => {
+            successHandler({
+              txId
+            });
+          }, 3000);
+        }
+      } catch (e) {
+        console.log('rpc disconnected', e);
       }
     }, 1000);
     return () => {
@@ -6204,17 +6228,27 @@ function useAllowance() {
   }, [selectedCoin, sourceChain]);
   const [targetAddress, setTargetAddress] = useState();
   const isApproved = useMemo(() => {
-    if (!isEVMChain(sourceChain)) return splAllowance >= amount + serviceFee;
+    if (!isEVMChain(sourceChain)) {
+      return allowance >= amount + serviceFee;
+    }
     if (allowance && amount && allowance.gte(parseUnits((amount + serviceFee).toString(), decimals))) return true;
     return false;
   }, [decimals, sourceChain, allowance, amount, splAllowance, serviceFee]);
   const updatePoolAddress = async () => {
-    var _result$tssPubkey;
-    const result = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/tss_pubkey`);
-    if ((result === null || result === void 0 ? void 0 : (_result$tssPubkey = result.tssPubkey) === null || _result$tssPubkey === void 0 ? void 0 : _result$tssPubkey.length) < 1) {
-      return;
+    try {
+      var _result$tssPubkey;
+      if (sourceChain === ChainName.SOLANA) {
+        setTargetAddress('8ymXJ6RH9k8qSf1xsvxSWgzPB9RYgUuHPDgonkFzUEhT');
+        return;
+      }
+      const result = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/tss_pubkey`);
+      if ((result === null || result === void 0 ? void 0 : (_result$tssPubkey = result.tssPubkey) === null || _result$tssPubkey === void 0 ? void 0 : _result$tssPubkey.length) < 1) {
+        return;
+      }
+      setTargetAddress(sourceChain === ChainName.SOLANA ? result.tssPubkey[0].ebdsa : result.tssPubkey[0].ecdsa);
+    } catch (e) {
+      console.log('rpc disconnected', e);
     }
-    setTargetAddress(sourceChain === ChainName.SOLANA ? result.tssPubkey[0].ebdsa : result.tssPubkey[0].ecdsa);
   };
   useEffect(() => {
     if (!nodeProviderQuery) return;
@@ -6223,7 +6257,20 @@ function useAllowance() {
   useEffect(() => {
     (async () => {
       try {
-        if (!isEVMChain(sourceChain) || !tokenAddress || !targetAddress || !signer || !signerAddress) return;
+        if (!isEVMChain(sourceChain) && publicKey && tokenAddress && connection) {
+          var _accountInfo$value, _parsedAccountInfo$pa, _parsedAccountInfo$pa2, _parsedAccountInfo$pa3, _parsedAccountInfo$pa4, _parsedAccountInfo$pa5;
+          const mint = new PublicKey(tokenAddress);
+          console.log(mint, publicKey, tokenAddress);
+          const fromTokenAccount = await getOrCreateAssociatedTokenAccount(connection, publicKey, mint, publicKey, signTransaction);
+          console.log(fromTokenAccount);
+          const accountInfo = await connection.getParsedAccountInfo(fromTokenAccount.address);
+          console.log(accountInfo);
+          setDecimals(COIN_LIST['USDK'].decimals);
+          const parsedAccountInfo = accountInfo === null || accountInfo === void 0 ? void 0 : (_accountInfo$value = accountInfo.value) === null || _accountInfo$value === void 0 ? void 0 : _accountInfo$value.data;
+          setAllowance(((_parsedAccountInfo$pa = parsedAccountInfo.parsed) === null || _parsedAccountInfo$pa === void 0 ? void 0 : (_parsedAccountInfo$pa2 = _parsedAccountInfo$pa.info) === null || _parsedAccountInfo$pa2 === void 0 ? void 0 : _parsedAccountInfo$pa2.delegate) === targetAddress ? (_parsedAccountInfo$pa3 = parsedAccountInfo.parsed) === null || _parsedAccountInfo$pa3 === void 0 ? void 0 : (_parsedAccountInfo$pa4 = _parsedAccountInfo$pa3.info) === null || _parsedAccountInfo$pa4 === void 0 ? void 0 : (_parsedAccountInfo$pa5 = _parsedAccountInfo$pa4.delegatedAmount) === null || _parsedAccountInfo$pa5 === void 0 ? void 0 : _parsedAccountInfo$pa5.uiAmount : 0);
+          return;
+        }
+        if (!tokenAddress || !targetAddress || !signer || !signerAddress) return;
         const erc20Contract = new Contract(tokenAddress, ERC20ABI.abi, signer);
         const decimals = await erc20Contract.decimals();
         const userAllowance = await erc20Contract.allowance(signerAddress, targetAddress);
@@ -6233,7 +6280,7 @@ function useAllowance() {
         errorHandler(error);
       }
     })();
-  }, [signerAddress, tokenAddress, targetAddress, isApproving, sourceChain]);
+  }, [signerAddress, tokenAddress, targetAddress, isApproving, sourceChain, publicKey]);
   const approve = useCallback(async () => {
     if (isEVMChain(sourceChain)) {
       if (!decimals || !tokenAddress || !signer || !targetAddress) return;
@@ -6294,7 +6341,7 @@ async function getFeeInUSD(sourceChain, targetChain, gasFee) {
   if (targetChain === ChainName.SOLANA) {
     targetFee = +gasFee[targetChain] * +targetTokenPrice;
   } else targetFee = gasFee[targetChain] ? +gasFee[targetChain] * max_gas * +targetTokenPrice / 1e9 : 0;
-  return [sourceFee, targetFee];
+  return [isNaN(sourceFee) ? 0 : sourceFee, isNaN(targetFee) ? 0 : targetFee];
 }
 function useServiceFee() {
   const {
@@ -6323,10 +6370,11 @@ function useServiceFee() {
       });
       const estimation = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/estimate_transfer/${sourceChain}/${walletAddress}/${targetChain}/${targetAddress}/${amount}`);
       const [originFee, targetFee] = await getFeeInUSD(sourceChain, targetChain, gasFee);
-      const fee = parseFloat(estimation.estimateTransfer.TakerPenalty) + parseFloat(estimation.estimateTransfer.MakerPenalty) - parseFloat(estimation.estimateTransfer.TakerBounty) - parseFloat(estimation.estimateTransfer.MakerBounty) + parseFloat(estimation.estimateTransfer.NetworkFee) + originFee + targetFee;
+      let fee = parseFloat(estimation.estimateTransfer.TakerPenalty) + parseFloat(estimation.estimateTransfer.MakerPenalty) - parseFloat(estimation.estimateTransfer.TakerBounty) - parseFloat(estimation.estimateTransfer.MakerBounty) + parseFloat(estimation.estimateTransfer.NetworkFee) + originFee + targetFee;
+      fee = fee < 0 ? 0 : fee;
       setServiceFee(parseFloat(fee.toFixed(2)));
     } catch (e) {
-      console.log(e);
+      console.log('rpc disconnected', e);
     }
   };
   useEffect(() => {
@@ -6334,7 +6382,7 @@ function useServiceFee() {
     getServiceFee();
     const timerId = setInterval(() => {
       getServiceFee();
-    }, 5 * 1000);
+    }, 20 * 1000);
     return () => {
       clearInterval(timerId);
     };
@@ -6361,9 +6409,13 @@ function useCurrencyOptions() {
   useEffect(() => {
     if (!nodeProviderQuery || !originNetwork || !targetNetwork) return;
     (async function () {
-      var _coins$Currencies;
-      const coins = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/getCurrencies/${originNetwork}/${targetNetwork}`);
-      setOptions(COIN_LIST[(_coins$Currencies = coins.Currencies) !== null && _coins$Currencies !== void 0 && _coins$Currencies.length ? coins.Currencies[0] : 'USDK']);
+      try {
+        var _coins$Currencies;
+        const coins = await fetchWrapper.get(`${nodeProviderQuery}/kima-finance/kima/kima/getCurrencies/${originNetwork}/${targetNetwork}`);
+        setOptions(COIN_LIST[(_coins$Currencies = coins.Currencies) !== null && _coins$Currencies !== void 0 && _coins$Currencies.length ? coins.Currencies[0] : 'USDK']);
+      } catch (e) {
+        console.log('rpc disconnected', e);
+      }
     })();
   }, [nodeProviderQuery, originNetwork, targetNetwork]);
   return useMemo(() => ({
@@ -6458,6 +6510,7 @@ const TransferWidget = ({
     } catch (e) {
       errorHandler(e);
       dispatch(setSubmitting(false));
+      console.log('rpc disconnected', e);
     }
   };
   const onNext = () => {
@@ -6595,8 +6648,12 @@ const KimaTransactionWidget = ({
     if (mode === ModeOptions.payment) {
       dispatch(setTargetNetwork((transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.targetChain) || ChainName.ETHEREUM));
       (async function () {
-        const networks = await fetchWrapper.get(`${kimaNodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${(transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.targetChain) || ChainName.ETHEREUM}`);
-        dispatch(setOriginNetwork(networks.Chains[0]));
+        try {
+          const networks = await fetchWrapper.get(`${kimaNodeProviderQuery}/kima-finance/kima/kima/get_available_chains/${(transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.targetChain) || ChainName.ETHEREUM}`);
+          dispatch(setOriginNetwork(networks.Chains[0]));
+        } catch (e) {
+          console.log('rpc disconnected', e);
+        }
       })();
       dispatch(setTargetAddress((transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.targetAddress) || ''));
       dispatch(setAmount((transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.amount) || 0));