@orderly.network/hooks 0.0.68 → 0.0.70

package/dist/index.mjs

@@ -6,7 +6,7 @@ import useSWRMutation from 'swr/mutation';
 import useConstant from 'use-constant';
 export { default as useConstant } from 'use-constant';
 import { SimpleDI, Account, EventEmitter, utils } from '@orderly.network/core';
-import { AccountStatusEnum, OrderSide, chainsMap, ARBITRUM_TESTNET_CHAINID, ARBITRUM_MAINNET_CHAINID, OrderStatus as OrderStatus$1, OrderType } from '@orderly.network/types';
+import { AccountStatusEnum, OrderSide, chainsInfoMap, ARBITRUM_TESTNET_CHAINID, ARBITRUM_MAINNET_CHAINID, OrderStatus as OrderStatus$1, WS_WalletStatusEnum, OrderType } from '@orderly.network/types';
 import useSWRSubscription from 'swr/subscription';
 import { Decimal, zero, getPrecisionByNumber, timeConvertString } from '@orderly.network/utils';
 import { pathOr, propOr, compose, head, prop, mergeDeepRight, pick } from 'ramda';
@@ -2923,6 +2923,7 @@ var woofiDexCrossChainRouterAbi = [
   }
 ];
 var nativeTokenAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
+var isNativeTokenChecker = (address) => address === nativeTokenAddress;
 
 // src/orderly/useChains.ts
 var useChains = (networkId, options = {}) => {
@@ -2966,9 +2967,10 @@ var useChains = (networkId, options = {}) => {
       item.chain_details.forEach((chain) => {
         const chainId = Number(chain.chain_id);
         orderlyChainIds.add(chainId);
+        const chainInfo = chainsInfoMap.get(chainId);
         const _chain = {
           network_infos: {
-            name: chain.chain_name ?? "--",
+            name: chain.chain_name ?? chainInfo?.chainName ?? "--",
             // "public_rpc_url": "https://arb1.arbitrum.io/rpc",
             chain_id: chainId,
             withdrawal_fee: chain.withdrawal_fee,
@@ -3099,7 +3101,7 @@ var useChain = (token) => {
     let item = data.find((chain) => chain.token === token);
     if (item) {
       item.chain_details = item.chain_details.map((d) => {
-        const chain = chainsMap.get(Number(d.chain_id));
+        const chain = chainsInfoMap.get(Number(d.chain_id));
         return {
           ...d,
           chain_name: chain?.chainName ?? "--"
@@ -3133,9 +3135,7 @@ var useWithdraw = () => {
   }, [usdc, unsettledPnL]);
   return { withdraw, isLoading, maxAmount, availableBalance, unsettledPnL };
 };
-var isNativeTokenChecker = (address) => address === nativeTokenAddress;
 var useDeposit = (options) => {
-  console.log("useDeposit options:", options);
   const { onlyTestnet } = useContext(OrderlyContext);
   const [balanceRevalidating, setBalanceRevalidating] = useState(false);
   const [allowanceRevalidating, setAllowanceRevalidating] = useState(false);
@@ -3145,6 +3145,7 @@ var useDeposit = (options) => {
   const [balance, setBalance] = useState("0");
   const [allowance, setAllowance] = useState("0");
   const { account: account5, state } = useAccount();
+  const prevAddress = useRef();
   const dst = useMemo(() => {
     const chain = onlyTestnet ? findByChainId(ARBITRUM_TESTNET_CHAINID) : findByChainId(ARBITRUM_MAINNET_CHAINID);
     const USDC = chain?.token_infos.find((token) => token.symbol === "USDC");
@@ -3172,21 +3173,21 @@ var useDeposit = (options) => {
           decimals
         });
       } else {
-        balance2 = await account5.assetsManager.getBalance(address);
+        balance2 = await account5.assetsManager.getBalance(address, { decimals });
       }
       return balance2;
     },
     []
   );
   const fetchBalance = useCallback(
-    async (address) => {
+    async (address, decimals) => {
       if (!address)
         return;
       try {
         if (balanceRevalidating)
           return;
         setBalanceRevalidating(true);
-        const balance2 = await fetchBalanceHandler(address);
+        const balance2 = await fetchBalanceHandler(address, decimals);
         console.log("----- refresh balance -----", balance2);
         setBalance(() => balance2);
         setBalanceRevalidating(false);
@@ -3210,46 +3211,81 @@ var useDeposit = (options) => {
     const balances = await Promise.all(tasks);
     console.log("----- get balances from tokens -----", balances);
   }, []);
-  const getAllowance = useCallback(
-    async (address, vaultAddress) => {
-      console.log("getAllowance", address, vaultAddress);
-      if (!address || !vaultAddress)
-        return;
-      if (address && isNativeTokenChecker(address))
-        return;
-      if (allowanceRevalidating)
-        return;
-      setAllowanceRevalidating(true);
-      const allowance2 = await account5.assetsManager.getAllowance(
-        address,
-        vaultAddress
-      );
-      console.log("----- refresh allowance -----", allowance2);
-      setAllowance(() => allowance2);
-      setAllowanceRevalidating(false);
-      return allowance2;
-    },
-    [allowanceRevalidating]
-  );
+  const getAllowance = async (address, vaultAddress) => {
+    const key = `${address}-${vaultAddress}`;
+    if (prevAddress.current === key)
+      return;
+    if (!address || !vaultAddress)
+      return;
+    if (address && isNativeTokenChecker(address))
+      return;
+    prevAddress.current = key;
+    const allowance2 = await account5.assetsManager.getAllowance(
+      address,
+      vaultAddress
+    );
+    setAllowance(() => allowance2);
+    return allowance2;
+  };
+  const getAllowanceByDefaultAddress = async (address) => {
+    if (prevAddress.current === address)
+      return;
+    if (!address || isNativeTokenChecker(address))
+      return;
+    prevAddress.current = address;
+    const allowance2 = await account5.assetsManager.getAllowance(address);
+    console.log(
+      "----- refresh allowance only orderly -----",
+      { allowance: allowance2 }
+    );
+    setAllowance(() => allowance2);
+  };
+  const getVaultAddress = useCallback(() => {
+    if (dst.chainId !== options?.srcChainId) {
+      return options?.crossChainRouteAddress;
+    } else {
+      if (dst.symbol !== options?.srcToken) {
+        return options?.depositorAddress;
+      }
+    }
+  }, [options, dst]);
   useEffect(() => {
     if (state.status < AccountStatusEnum.Connected)
       return;
-    fetchBalance(options?.address);
-    getAllowance(options?.address, options?.vaultAddress);
-  }, [state.status, options?.address, options?.vaultAddress, account5.address]);
+    fetchBalance(options?.address, options?.decimals);
+    if (dst.chainId !== options?.srcChainId) {
+      getAllowance(options?.address, options?.crossChainRouteAddress);
+    } else {
+      if (dst.symbol !== options?.srcToken) {
+        getAllowance(options?.address, options?.depositorAddress);
+      } else {
+        getAllowanceByDefaultAddress(options?.address);
+      }
+    }
+  }, [
+    state.status,
+    options?.address,
+    options?.crossChainRouteAddress,
+    options?.depositorAddress,
+    options?.srcChainId,
+    options?.srcToken,
+    account5.address,
+    dst
+  ]);
   const approve = useCallback(
     (amount) => {
       if (!options?.address) {
         throw new Error("address is required");
       }
-      return account5.assetsManager.approve(options.address, amount, options?.vaultAddress).then((result) => {
+      const vaultAddress = getVaultAddress();
+      return account5.assetsManager.approve(options.address, amount, vaultAddress).then((result) => {
         if (typeof amount !== "undefined") {
           setAllowance((value) => new Decimal(value).add(amount).toString());
         }
         return result;
       });
     },
-    [account5, getAllowance, options?.address, options?.vaultAddress]
+    [account5, getAllowance, options?.address]
   );
   const deposit = useCallback(
     (amount) => {
@@ -3577,24 +3613,37 @@ var useCrossSwap = () => {
     "WAITTING" /* INITIALIZING */
   );
   const [bridgeMessage, setBridgeMessage] = useState();
+  const [status, setStatus] = useState(
+    WS_WalletStatusEnum.NO
+  );
+  const txHashFromBridge = useRef();
   const account5 = useAccountInstance();
   const { networkId, configStore } = useContext(OrderlyContext);
   const client = useRef(createClient(networkId)).current;
   const timer = useRef();
+  useWalletSubscription({
+    onMessage: (message) => {
+      const { side, transStatus, trxId } = message;
+      if (side === "DEPOSIT" && trxId === txHashFromBridge.current) {
+        setStatus(transStatus);
+      }
+    }
+  });
   const checkLayerStatus = useCallback((txHash) => {
     const check = async (txHash2) => {
       const { messages } = await client.getMessagesBySrcTxHash(txHash2);
       console.log("messages:", messages);
       if (messages.length > 0) {
-        const { status } = messages[0];
-        if (status === "INFLIGHT" /* INFLIGHT */) {
+        const { status: status2 } = messages[0];
+        if (status2 === "INFLIGHT" /* INFLIGHT */) {
           setTimeout(() => {
             check(txHash2);
           }, 1e3);
         }
-        setLayerStatus(status);
-        if (status === "DELIVERED" /* DELIVERED */) {
+        setLayerStatus(status2);
+        if (status2 === "DELIVERED" /* DELIVERED */) {
           setBridgeMessage(messages[0]);
+          txHashFromBridge.current = messages[0].dstTxHash;
         }
       } else {
         setTimeout(() => {
@@ -3648,20 +3697,12 @@ var useCrossSwap = () => {
           from: account5.address,
           to: crossChainRouteAddress,
           data: [account5.address, src, dst, dstValutDeposit()],
-          value: quotoLZFee[0]
+          value: isNativeTokenChecker(inputs.src.fromToken) ? BigInt(inputs.src.fromAmount) + quotoLZFee[0] : quotoLZFee[0]
         },
         {
           abi: woofiDexCrossChainRouterAbi
         }
       );
-      account5.walletClient.on(
-        {
-          address: crossChainRouteAddress
-        },
-        (log, event) => {
-          console.log("-------------", log, event);
-        }
-      );
       stop();
       checkLayerStatus(result.hash);
       return pick(["from", "to", "hash", "value"], result);
@@ -3674,7 +3715,8 @@ var useCrossSwap = () => {
   return {
     swap,
     loading,
-    status: layerStatus,
+    bridgeStatus: layerStatus,
+    status,
     message: bridgeMessage
   };
 };
@@ -3956,15 +3998,28 @@ var useSwap = () => {
   const [loading, { setTrue: start, setFalse: stop }] = useBoolean(false);
   const account5 = useAccountInstance();
   const { configStore } = useContext(OrderlyContext);
+  const [status, setStatus] = useState(
+    WS_WalletStatusEnum.NO
+  );
+  const txHash = useRef();
+  useWalletSubscription({
+    onMessage: (message) => {
+      const { side, transStatus, trxId } = message;
+      if (side === "DEPOSIT" && trxId === txHash.current) {
+        setStatus(transStatus);
+      }
+    }
+  });
   const dstValutDeposit = useCallback(() => {
+    const brokerId = configStore.get("onlyTestnet") ? "woofi_dex" : "woofi_pro";
     return {
       accountId: account5.accountIdHashStr,
-      brokerHash: utils.parseBrokerHash(configStore.get("brokerId")),
+      brokerHash: utils.parseBrokerHash(brokerId),
       tokenHash: utils.parseTokenHash("USDC")
     };
   }, [account5]);
   const swap = useCallback(
-    async (woofiDexDepositorAdress, inputs) => {
+    async (woofiDexDepositorAdress, inputs, config) => {
       if (!account5.walletClient) {
         throw new Error("walletClient is undefined");
       }
@@ -3974,20 +4029,24 @@ var useSwap = () => {
       if (loading)
         return;
       start();
+      const txPayload = {
+        from: account5.address,
+        to: woofiDexDepositorAdress,
+        data: [account5.address, inputs, dstValutDeposit()],
+        value: isNativeTokenChecker(inputs.fromToken) ? BigInt(inputs.fromAmount) + inputs.orderlyNativeFees : inputs.orderlyNativeFees
+      };
       try {
         const result = await account5.walletClient.sendTransaction(
           woofiDexDepositorAdress,
           "swap",
-          {
-            from: account5.address,
-            to: woofiDexDepositorAdress,
-            data: [account5.address, inputs, dstValutDeposit()]
-          },
+          txPayload,
           {
             abi: woofiDexDepositorAbi
           }
         );
         stop();
+        console.log("single swap result", result);
+        txHash.current = result.hash;
         return pick(["from", "to", "hash", "value"], result);
       } catch (e) {
         console.log("\u8C03\u7528\u5408\u7EA6\u62A5\u9519\uFF1A", e);
@@ -3998,7 +4057,8 @@ var useSwap = () => {
   );
   return {
     swap,
-    loading
+    loading,
+    status
   };
 };