@orderly.network/hooks 0.0.68 → 0.0.69

package/dist/index.d.mts

@@ -5,7 +5,7 @@ import * as _orderly_network_core from '@orderly.network/core';
 import { Account, AccountState, ConfigStore, OrderlyKeyStore, getWalletAdapterFunc, IContract, EventEmitter } from '@orderly.network/core';
 import * as react from 'react';
 import react__default, { FC, PropsWithChildren } from 'react';
-import { NetworkId, OrderSide, OrderEntity, API, WSMessage } from '@orderly.network/types';
+import { NetworkId, OrderSide, OrderEntity, API, WSMessage, WS_WalletStatusEnum } from '@orderly.network/types';
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as swr__internal from 'swr/_internal';
@@ -307,8 +307,11 @@ declare const useWithdraw: () => WithdrawReturns;
 type useDepositOptions = {
     address?: string;
     decimals?: number;
-    vaultAddress?: string;
+    crossChainRouteAddress?: string;
+    depositorAddress?: string;
     networkId?: NetworkId;
+    srcChainId?: number;
+    srcToken?: string;
 };
 declare const useDeposit: (options?: useDepositOptions) => {
     dst: {
@@ -448,7 +451,8 @@ declare const useCrossSwap: () => {
         readonly value: bigint;
     } | undefined>;
     loading: boolean;
-    status: MessageStatus;
+    bridgeStatus: MessageStatus;
+    status: WS_WalletStatusEnum;
     message: any;
 };
 
@@ -459,6 +463,9 @@ declare const useSwap: () => {
         toToken: string;
         minToAmount: string;
         orderlyNativeFees: bigint;
+    }, config: {
+        dst: any;
+        src: any;
     }) => Promise<{
         readonly hash: string;
         readonly to: string | null;
@@ -466,6 +473,7 @@ declare const useSwap: () => {
         readonly value: bigint;
     } | undefined>;
     loading: boolean;
+    status: WS_WalletStatusEnum;
 };
 
 export { AppStateErrors, DataSourceProvider, OrderStatus, OrderlyAppConfig, OrderlyContext, OrderlyContextState, OrderlyProvider, index as apis, useAccount, useAccountInfo, useAccountInstance, useAppState, useBalance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useExecutionReport, useFetures, useFundingRate, useHoldingStream, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateQuery, useQuery, useRunOnce, useSessionStorage, useSwap, useSymbolsInfo, useTickerStream, useTokenInfo, useTopicObserve, useTradingView, useWS, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import * as _orderly_network_core from '@orderly.network/core';
 import { Account, AccountState, ConfigStore, OrderlyKeyStore, getWalletAdapterFunc, IContract, EventEmitter } from '@orderly.network/core';
 import * as react from 'react';
 import react__default, { FC, PropsWithChildren } from 'react';
-import { NetworkId, OrderSide, OrderEntity, API, WSMessage } from '@orderly.network/types';
+import { NetworkId, OrderSide, OrderEntity, API, WSMessage, WS_WalletStatusEnum } from '@orderly.network/types';
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as swr__internal from 'swr/_internal';
@@ -307,8 +307,11 @@ declare const useWithdraw: () => WithdrawReturns;
 type useDepositOptions = {
     address?: string;
     decimals?: number;
-    vaultAddress?: string;
+    crossChainRouteAddress?: string;
+    depositorAddress?: string;
     networkId?: NetworkId;
+    srcChainId?: number;
+    srcToken?: string;
 };
 declare const useDeposit: (options?: useDepositOptions) => {
     dst: {
@@ -448,7 +451,8 @@ declare const useCrossSwap: () => {
         readonly value: bigint;
     } | undefined>;
     loading: boolean;
-    status: MessageStatus;
+    bridgeStatus: MessageStatus;
+    status: WS_WalletStatusEnum;
     message: any;
 };
 
@@ -459,6 +463,9 @@ declare const useSwap: () => {
         toToken: string;
         minToAmount: string;
         orderlyNativeFees: bigint;
+    }, config: {
+        dst: any;
+        src: any;
     }) => Promise<{
         readonly hash: string;
         readonly to: string | null;
@@ -466,6 +473,7 @@ declare const useSwap: () => {
         readonly value: bigint;
     } | undefined>;
     loading: boolean;
+    status: WS_WalletStatusEnum;
 };
 
 export { AppStateErrors, DataSourceProvider, OrderStatus, OrderlyAppConfig, OrderlyContext, OrderlyContextState, OrderlyProvider, index as apis, useAccount, useAccountInfo, useAccountInstance, useAppState, useBalance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useExecutionReport, useFetures, useFundingRate, useHoldingStream, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateQuery, useQuery, useRunOnce, useSessionStorage, useSwap, useSymbolsInfo, useTickerStream, useTokenInfo, useTopicObserve, useTradingView, useWS, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };

package/dist/index.js

@@ -2932,6 +2932,7 @@ var woofiDexCrossChainRouterAbi = [
   }
 ];
 var nativeTokenAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
+var isNativeTokenChecker = (address) => address === nativeTokenAddress;
 
 // src/orderly/useChains.ts
 var useChains = (networkId, options = {}) => {
@@ -2975,9 +2976,10 @@ var useChains = (networkId, options = {}) => {
       item.chain_details.forEach((chain) => {
         const chainId = Number(chain.chain_id);
         orderlyChainIds.add(chainId);
+        const chainInfo = types.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,
@@ -3108,7 +3110,7 @@ var useChain = (token) => {
     let item = data.find((chain) => chain.token === token);
     if (item) {
       item.chain_details = item.chain_details.map((d) => {
-        const chain = types.chainsMap.get(Number(d.chain_id));
+        const chain = types.chainsInfoMap.get(Number(d.chain_id));
         return {
           ...d,
           chain_name: chain?.chainName ?? "--"
@@ -3142,9 +3144,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 } = React2.useContext(OrderlyContext);
   const [balanceRevalidating, setBalanceRevalidating] = React2.useState(false);
   const [allowanceRevalidating, setAllowanceRevalidating] = React2.useState(false);
@@ -3154,6 +3154,7 @@ var useDeposit = (options) => {
   const [balance, setBalance] = React2.useState("0");
   const [allowance, setAllowance] = React2.useState("0");
   const { account: account5, state } = useAccount();
+  const prevAddress = React2.useRef();
   const dst = React2.useMemo(() => {
     const chain = onlyTestnet ? findByChainId(types.ARBITRUM_TESTNET_CHAINID) : findByChainId(types.ARBITRUM_MAINNET_CHAINID);
     const USDC = chain?.token_infos.find((token) => token.symbol === "USDC");
@@ -3219,46 +3220,85 @@ var useDeposit = (options) => {
     const balances = await Promise.all(tasks);
     console.log("----- get balances from tokens -----", balances);
   }, []);
-  const getAllowance = React2.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;
+    console.log("getAllowance", address, vaultAddress);
+    prevAddress.current = key;
+    const allowance2 = await account5.assetsManager.getAllowance(
+      address,
+      vaultAddress
+    );
+    console.log("----- refresh allowance -----", {
+      allowance: allowance2
+    });
+    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 = React2.useCallback(() => {
+    if (dst.chainId !== options?.srcChainId) {
+      return options?.crossChainRouteAddress;
+    } else {
+      if (dst.symbol !== options?.srcToken) {
+        return options?.depositorAddress;
+      }
+    }
+  }, [options, dst]);
   React2.useEffect(() => {
     if (state.status < types.AccountStatusEnum.Connected)
       return;
     fetchBalance(options?.address);
-    getAllowance(options?.address, options?.vaultAddress);
-  }, [state.status, options?.address, options?.vaultAddress, account5.address]);
+    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 = React2.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 utils.Decimal(value).add(amount).toString());
         }
         return result;
       });
     },
-    [account5, getAllowance, options?.address, options?.vaultAddress]
+    [account5, getAllowance, options?.address]
   );
   const deposit = React2.useCallback(
     (amount) => {
@@ -3586,24 +3626,37 @@ var useCrossSwap = () => {
     "WAITTING" /* INITIALIZING */
   );
   const [bridgeMessage, setBridgeMessage] = React2.useState();
+  const [status, setStatus] = React2.useState(
+    types.WS_WalletStatusEnum.NO
+  );
+  const txHashFromBridge = React2.useRef();
   const account5 = useAccountInstance();
   const { networkId, configStore } = React2.useContext(OrderlyContext);
   const client = React2.useRef(scanClient.createClient(networkId)).current;
   const timer = React2.useRef();
+  useWalletSubscription({
+    onMessage: (message) => {
+      const { side, transStatus, trxId } = message;
+      if (side === "DEPOSIT" && trxId === txHashFromBridge.current) {
+        setStatus(transStatus);
+      }
+    }
+  });
   const checkLayerStatus = React2.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(() => {
@@ -3657,20 +3710,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 ramda.pick(["from", "to", "hash", "value"], result);
@@ -3683,7 +3728,8 @@ var useCrossSwap = () => {
   return {
     swap,
     loading,
-    status: layerStatus,
+    bridgeStatus: layerStatus,
+    status,
     message: bridgeMessage
   };
 };
@@ -3965,15 +4011,28 @@ var useSwap = () => {
   const [loading, { setTrue: start, setFalse: stop }] = useBoolean(false);
   const account5 = useAccountInstance();
   const { configStore } = React2.useContext(OrderlyContext);
+  const [status, setStatus] = React2.useState(
+    types.WS_WalletStatusEnum.NO
+  );
+  const txHash = React2.useRef();
+  useWalletSubscription({
+    onMessage: (message) => {
+      const { side, transStatus, trxId } = message;
+      if (side === "DEPOSIT" && trxId === txHash.current) {
+        setStatus(transStatus);
+      }
+    }
+  });
   const dstValutDeposit = React2.useCallback(() => {
+    const brokerId = configStore.get("onlyTestnet") ? "woofi_dex" : "woofi_pro";
     return {
       accountId: account5.accountIdHashStr,
-      brokerHash: core.utils.parseBrokerHash(configStore.get("brokerId")),
+      brokerHash: core.utils.parseBrokerHash(brokerId),
       tokenHash: core.utils.parseTokenHash("USDC")
     };
   }, [account5]);
   const swap = React2.useCallback(
-    async (woofiDexDepositorAdress, inputs) => {
+    async (woofiDexDepositorAdress, inputs, config) => {
       if (!account5.walletClient) {
         throw new Error("walletClient is undefined");
       }
@@ -3983,20 +4042,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 ramda.pick(["from", "to", "hash", "value"], result);
       } catch (e) {
         console.log("\u8C03\u7528\u5408\u7EA6\u62A5\u9519\uFF1A", e);
@@ -4007,7 +4070,8 @@ var useSwap = () => {
   );
   return {
     swap,
-    loading
+    loading,
+    status
   };
 };