@orderly.network/hooks 1.0.9 → 1.0.10

package/dist/index.d.mts

@@ -9,9 +9,8 @@ import { AccountState, Account, EventEmitter, ConfigKey, ConfigStore, OrderlyKey
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as react from 'react';
-import { PropsWithChildren } from 'react';
+import react__default, { PropsWithChildren } from 'react';
 import { NetworkId, OrderSide, OrderEntity, API, WSMessage, OrderStatus, WS_WalletStatusEnum } from '@orderly.network/types';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as swr_subscription from 'swr/subscription';
 import { Decimal } from '@orderly.network/utils';
 export * from 'use-debounce';
@@ -96,10 +95,10 @@ interface OrderlyConfigContextState {
     getWalletAdapter: getWalletAdapterFunc;
     networkId: NetworkId;
     onlyTestnet?: boolean;
+    enableSwapDeposit?: boolean;
 }
 declare const OrderlyContext: react.Context<OrderlyConfigContextState>;
 declare const OrderlyProvider: react.Provider<OrderlyConfigContextState>;
-declare const useOrderlyContext: () => OrderlyConfigContextState;
 
 declare type RequireAtLeastOne<T, R extends keyof T = keyof T> = Omit<T, R> & {
     [K in R]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<R, K>>>;
@@ -110,8 +109,9 @@ interface ConfigProviderProps {
     getWalletAdapter?: getWalletAdapterFunc;
     brokerId: string;
     networkId: NetworkId;
+    enableSwapDeposit?: boolean;
 }
-declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react_jsx_runtime.JSX.Element | null;
+declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react__default.JSX.Element | null;
 
 declare type ConnectedChain = {
     id: string;
@@ -341,7 +341,6 @@ declare const useDeposit: (options?: useDepositOptions | undefined) => {
 declare const useHoldingStream: () => {
     data: API.Holding[] | undefined;
     usdc: API.Holding | undefined;
-    balance: any;
     isLoading: boolean;
 };
 
@@ -432,4 +431,4 @@ declare const useSwap: () => {
     status: WS_WalletStatusEnum;
 };
 
-export { ConfigProviderProps, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, useOrderlyContext, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };
+export { ConfigProviderProps, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };

package/dist/index.d.ts

@@ -9,9 +9,8 @@ import { AccountState, Account, EventEmitter, ConfigKey, ConfigStore, OrderlyKey
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as react from 'react';
-import { PropsWithChildren } from 'react';
+import react__default, { PropsWithChildren } from 'react';
 import { NetworkId, OrderSide, OrderEntity, API, WSMessage, OrderStatus, WS_WalletStatusEnum } from '@orderly.network/types';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as swr_subscription from 'swr/subscription';
 import { Decimal } from '@orderly.network/utils';
 export * from 'use-debounce';
@@ -96,10 +95,10 @@ interface OrderlyConfigContextState {
     getWalletAdapter: getWalletAdapterFunc;
     networkId: NetworkId;
     onlyTestnet?: boolean;
+    enableSwapDeposit?: boolean;
 }
 declare const OrderlyContext: react.Context<OrderlyConfigContextState>;
 declare const OrderlyProvider: react.Provider<OrderlyConfigContextState>;
-declare const useOrderlyContext: () => OrderlyConfigContextState;
 
 declare type RequireAtLeastOne<T, R extends keyof T = keyof T> = Omit<T, R> & {
     [K in R]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<R, K>>>;
@@ -110,8 +109,9 @@ interface ConfigProviderProps {
     getWalletAdapter?: getWalletAdapterFunc;
     brokerId: string;
     networkId: NetworkId;
+    enableSwapDeposit?: boolean;
 }
-declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react_jsx_runtime.JSX.Element | null;
+declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react__default.JSX.Element | null;
 
 declare type ConnectedChain = {
     id: string;
@@ -341,7 +341,6 @@ declare const useDeposit: (options?: useDepositOptions | undefined) => {
 declare const useHoldingStream: () => {
     data: API.Holding[] | undefined;
     usdc: API.Holding | undefined;
-    balance: any;
     isLoading: boolean;
 };
 
@@ -432,4 +431,4 @@ declare const useSwap: () => {
     status: WS_WalletStatusEnum;
 };
 
-export { ConfigProviderProps, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, useOrderlyContext, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };
+export { ConfigProviderProps, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };

package/dist/index.js

@@ -8,7 +8,6 @@ var useConstant4 = require('use-constant');
 var core = require('@orderly.network/core');
 var types = require('@orderly.network/types');
 var useSWRInfinite = require('swr/infinite');
-var jsxRuntime = require('react/jsx-runtime');
 var utils = require('@orderly.network/utils');
 var useSWRSubscription = require('swr/subscription');
 var ramda = require('ramda');
@@ -31,9 +30,6 @@ var OrderlyContext = React.createContext({
   // configStore: new MemoryConfigStore(),
 });
 var OrderlyProvider = OrderlyContext.Provider;
-var useOrderlyContext = () => {
-  return React.useContext(OrderlyContext);
-};
 
 // src/useConfig.ts
 var useConfig = (key, defaultValue) => {
@@ -289,22 +285,15 @@ var useBoolean = (initialValue = false) => {
   return [value, { setTrue, setFalse, toggle }];
 };
 var usePreLoadData = () => {
-  const { configStore } = React.useContext(OrderlyContext);
-  const { error: swapSupportError, data: swapSupportData } = useSWR__default.default(
-    `${configStore.get("swapSupportApiUrl")}/swap_support`,
-    (url) => fetch(url).then((res) => res.json()),
-    {
-      revalidateOnFocus: false
-    }
-  );
+  React.useContext(OrderlyContext);
   const { error: tokenError, data: tokenData } = useQuery("/v1/public/token", {
     revalidateOnFocus: false
   });
   const isDone = React.useMemo(() => {
-    return !!swapSupportData && !!tokenData;
-  }, [swapSupportData, tokenData]);
+    return !!tokenData;
+  }, [tokenData]);
   return {
-    error: swapSupportError || tokenError,
+    error: tokenError,
     done: isDone
   };
 };
@@ -448,7 +437,7 @@ var useWS = () => {
 };
 var OrderlyConfigProvider = (props) => {
   const [account5, setAccount] = React__default.default.useState(null);
-  const { configStore, keyStore, getWalletAdapter, brokerId, networkId } = props;
+  const { configStore, keyStore, getWalletAdapter, brokerId, networkId, enableSwapDeposit } = props;
   if (!brokerId && typeof configStore === "undefined") {
     console.error("[OrderlyConfigProvider]: brokerId is required");
   }
@@ -476,17 +465,19 @@ var OrderlyConfigProvider = (props) => {
   if (!account5) {
     return null;
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(
+  return /* @__PURE__ */ React__default.default.createElement(
     OrderlyProvider,
     {
       value: {
         configStore: innerConfigStore,
         keyStore: innerKeyStore,
         getWalletAdapter: innerGetWalletAdapter,
-        networkId
-      },
-      children: props.children
-    }
+        networkId,
+        enableSwapDeposit
+        // apiBaseUrl,
+      }
+    },
+    props.children
   );
 };
 var WalletConnectorContext = React.createContext({});
@@ -1103,8 +1094,8 @@ var usePositionStream = (symbol, options) => {
   const fundingRates = useFundingRates();
   const {
     data,
-    error
-    // mutate: updatePositions,
+    error,
+    mutate: updatePositions
   } = usePrivateQuery(`/v1/positions`, {
     // revalidateOnFocus: false,
     // revalidateOnReconnect: false,
@@ -1116,6 +1107,10 @@ var usePositionStream = (symbol, options) => {
     onError: (err) => {
     }
   });
+  usePositionUpdateStream((positions2) => {
+    console.log("position message", positions2);
+    updatePositions();
+  });
   const { data: markPrices } = useMarkPricesStream();
   const formatedPositions = React.useMemo(() => {
     if (!data?.rows || !symbolInfo || !accountInfo)
@@ -1264,6 +1259,41 @@ var pathOr_unsettledPnLPathOr = ramda.pathOr(0, [
   "aggregated",
   "unsettledPnL"
 ]);
+var usePositionUpdateStream = (callback) => {
+  const ws = useWS();
+  const positionList = React.useRef({});
+  return useSWRSubscription__default.default("positionUpdate", (key, { next }) => {
+    const unsubscribe = ws.privateSubscribe(
+      // { event: "subscribe", topic: "markprices" },
+      "position",
+      {
+        onMessage: (message) => {
+          const { positions: positions2 } = message;
+          let update = false;
+          for (const p in positions2) {
+            const { symbol, positionQty } = positions2[p];
+            if (positionList.current[symbol] !== positionQty) {
+              update = true;
+              positionList.current[symbol] = positionQty;
+            }
+          }
+          if (update) {
+            callback(positions2.current);
+          }
+          next(null, positionList);
+        },
+        // onUnsubscribe: () => {
+        //   return "markprices";
+        // },
+        onError: (error) => {
+        }
+      }
+    );
+    return () => {
+      unsubscribe?.();
+    };
+  });
+};
 var useHoldingStream = () => {
   const ws = useWS();
   const { data, isLoading, mutate: mutate2 } = usePrivateQuery(
@@ -1278,7 +1308,7 @@ var useHoldingStream = () => {
     const usdc2 = data?.find((item) => item.token === "USDC");
     return usdc2;
   }, [data]);
-  const { data: balance } = useSWRSubscription__default.default("holding", (_, { next }) => {
+  useSWRSubscription__default.default("holding", (_, { next }) => {
     const unsubscribe = ws.privateSubscribe(
       {
         id: "balance",
@@ -1310,7 +1340,6 @@ var useHoldingStream = () => {
   return {
     data,
     usdc,
-    balance,
     isLoading
   };
 };
@@ -1541,11 +1570,37 @@ var useCollateral = (options = { dp: 6 }) => {
 var positionsPath2 = ramda.pathOr([], [0, "rows"]);
 var useMaxQty = (symbol, side, reduceOnly = false) => {
   const positionsData = usePositionStream();
-  const [orders] = useOrderStream({ status: types.OrderStatus.NEW });
   const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   const symbolInfo = useSymbolsInfo();
   const { totalCollateral } = useCollateral();
   const { data: markPrices } = useMarkPricesStream();
+  const {
+    data: orders,
+    error,
+    mutate: updateOrder
+  } = usePrivateQuery(`/v1/orders?status=NEW&size=99`, {
+    formatter: (data) => data.rows,
+    onError: (err) => {
+    }
+  });
+  const ws = useWS();
+  React.useEffect(() => {
+    const unsubscribe = ws.privateSubscribe(
+      {
+        id: "executionreport_orders",
+        event: "subscribe",
+        topic: "executionreport",
+        ts: Date.now()
+      },
+      {
+        onMessage: (data) => {
+          console.log("refresh orders", data);
+          updateOrder();
+        }
+      }
+    );
+    return () => unsubscribe();
+  }, []);
   const maxQty = React.useMemo(() => {
     if (!symbol)
       return 0;
@@ -3089,6 +3144,17 @@ var useChains = (networkId, options = {}) => {
       ...swrOptions
     }
   );
+  const { data: chainInfos, error: chainInfoErr } = useQuery(
+    "/v1/public/chain_info",
+    {
+      revalidateIfStale: false,
+      revalidateOnFocus: false,
+      revalidateOnReconnect: false,
+      revalidateOnMount: true,
+      dedupingInterval: 36e5,
+      formatter: (data2) => data2.rows
+    }
+  );
   const { data: orderlyChains, error: tokenError } = useQuery(
     "/v1/public/token",
     {
@@ -3129,41 +3195,48 @@ var useChains = (networkId, options = {}) => {
           if (!options.filter(_chain))
             return;
         }
+        if (_chain.chain_id === 421613) {
+          const index = testnetArr.findIndex((item2) => item2.network_infos.chain_id === 421613);
+          if (index > -1) {
+            testnetArr[index] = _chain;
+          }
+        }
         map.current.set(chainId, _chain);
         orderlyChainsArr.push(_chain);
       });
     });
-    if (!wooSwapEnabled) {
-      let arr = orderlyChainsArr;
-      if (typeof options?.filter === "function") {
-        arr = orderlyChainsArr.filter(options.filter);
-      }
-      if (!!field) {
-        arr = arr.map((item) => item[field]);
+    let testnetArr = [
+      //@ts-ignore
+      {
+        network_infos: {
+          name: "Arbitrum Goerli",
+          shortName: "Arbitrum Goerli",
+          public_rpc_url: "https://goerli-rollup.arbitrum.io/rpc",
+          chain_id: 421613,
+          currency_symbol: "ETH",
+          bridge_enable: true,
+          mainnet: false,
+          explorer_base_url: "https://goerli.arbiscan.io/",
+          est_txn_mins: null,
+          woofi_dex_cross_chain_router: "",
+          woofi_dex_depositor: ""
+        },
+        token_infos: [
+          {
+            symbol: "USDC",
+            address: "0xfd064A18f3BF249cf1f87FC203E90D8f650f2d63",
+            decimals: 6,
+            swap_enable: false,
+            woofi_dex_precision: 2
+          }
+        ]
       }
-      return arr;
-    } else {
+    ];
+    let mainnetArr = [];
+    map.current.set(421613, testnetArr[0]);
+    if (wooSwapEnabled) {
       if (!data || !data.data)
         return data;
-      let testnetArr = [
-        //@ts-ignore
-        {
-          network_infos: {
-            name: "Arbitrum Goerli",
-            shortName: "Arbitrum Goerli",
-            public_rpc_url: "https://goerli-rollup.arbitrum.io/rpc",
-            chain_id: 421613,
-            currency_symbol: "ETH",
-            bridge_enable: true,
-            mainnet: false,
-            explorer_base_url: "https://goerli.arbiscan.io/",
-            est_txn_mins: null,
-            woofi_dex_cross_chain_router: "",
-            woofi_dex_depositor: ""
-          }
-        }
-      ];
-      let mainnetArr = [];
       Object.keys(data.data).forEach((key) => {
         const chain = data.data[key];
         const item = ramda.mergeDeepRight(chain, {
@@ -3189,27 +3262,65 @@ var useChains = (networkId, options = {}) => {
           testnetArr.push(item);
         }
       });
-      mainnetArr.sort((a, b) => {
-        return a.network_infos.bridgeless ? -1 : 1;
-      });
-      testnetArr.sort((a, b) => {
-        return a.network_infos.bridgeless ? -1 : 1;
+    } else {
+      if (!chainInfos)
+        return void 0;
+      orderlyChainsArr.forEach((chain) => {
+        let _chain = chain;
+        const networkInfo = chainInfos.find((item) => {
+          console.log(item.chain_id, chain.network_infos.chain_id);
+          return item.chain_id == chain.network_infos.chain_id;
+        });
+        if (networkInfo) {
+          const { name, public_rpc_url, chain_id, currency_symbol, explorer_base_url } = networkInfo;
+          _chain.network_infos = {
+            ..._chain.network_infos,
+            name,
+            shortName: name,
+            public_rpc_url,
+            currency_symbol,
+            bridge_enable: true,
+            mainnet: true,
+            explorer_base_url,
+            est_txn_mins: null,
+            woofi_dex_cross_chain_router: "",
+            woofi_dex_depositor: ""
+          };
+        }
+        map.current.set(_chain.network_infos.chain_id, _chain);
+        if (_chain.network_infos.chain_id === 421613) {
+          const index = testnetArr.findIndex((item) => item.network_infos.chain_id === 421613);
+          if (index > -1) {
+            testnetArr[index] = _chain;
+          }
+        }
+        if (typeof options?.filter === "function") {
+          if (!options.filter(_chain))
+            return;
+        }
+        mainnetArr.push(_chain);
       });
-      if (!!field) {
-        testnetArr = testnetArr.map((item) => item[field]);
-        mainnetArr = mainnetArr.map((item) => item[field]);
-      }
-      if (networkId === "mainnet") {
-        return mainnetArr;
-      }
-      if (networkId === "testnet") {
-        return testnetArr;
-      }
-      return {
-        testnet: testnetArr,
-        mainnet: mainnetArr
-      };
     }
+    mainnetArr.sort((a, b) => {
+      return a.network_infos.bridgeless ? -1 : 1;
+    });
+    testnetArr.sort((a, b) => {
+      return a.network_infos.bridgeless ? -1 : 1;
+    });
+    if (!!field) {
+      testnetArr = testnetArr.map((item) => item[field]);
+      mainnetArr = mainnetArr.map((item) => item[field]);
+    }
+    if (networkId === "mainnet") {
+      return mainnetArr;
+    }
+    if (networkId === "testnet") {
+      return testnetArr;
+    }
+    return {
+      testnet: testnetArr,
+      mainnet: mainnetArr
+    };
   }, [data, networkId, field, options, orderlyChains, wooSwapEnabled]);
   const findByChainId = React.useCallback(
     (chainId, field2) => {
@@ -3278,11 +3389,11 @@ var useWithdraw = () => {
   return { withdraw, isLoading, maxAmount, availableBalance, unsettledPnL };
 };
 var useDeposit = (options) => {
-  const { onlyTestnet } = React.useContext(OrderlyContext);
+  const { onlyTestnet, enableSwapDeposit } = React.useContext(OrderlyContext);
   const [balanceRevalidating, setBalanceRevalidating] = React.useState(false);
   const [allowanceRevalidating, setAllowanceRevalidating] = React.useState(false);
   const [_, { findByChainId }] = useChains(void 0, {
-    wooSwapEnabled: true
+    wooSwapEnabled: enableSwapDeposit
   });
   const [balance, setBalance] = React.useState("0");
   const [allowance, setAllowance] = React.useState("0");
@@ -3290,7 +3401,7 @@ var useDeposit = (options) => {
   const prevAddress = React.useRef();
   const getBalanceListener = React.useRef();
   const dst = React.useMemo(() => {
-    const chain = onlyTestnet ? findByChainId(types.ARBITRUM_TESTNET_CHAINID) : findByChainId(types.ARBITRUM_MAINNET_CHAINID);
+    const chain = onlyTestnet || 421613 == options?.srcChainId ? findByChainId(types.ARBITRUM_TESTNET_CHAINID) : findByChainId(types.ARBITRUM_MAINNET_CHAINID);
     const USDC = chain?.token_infos.find((token) => token.symbol === "USDC");
     if (!chain) {
       throw new Error("dst chain not found");
@@ -3510,17 +3621,6 @@ var usePrivateDataObserver = () => {
   const ws = useWS();
   const { mutate: mutate2 } = useSWR.useSWRConfig();
   const { state } = useAccount();
-  React.useEffect(() => {
-    console.log("----!!!usePrivateDataObserver!!!----");
-  }, []);
-  React.useEffect(() => {
-    const unsubscribe = ws.privateSubscribe("executionreport", {
-      onMessage: (data) => {
-        console.log(data);
-      }
-    });
-    return () => unsubscribe?.();
-  }, [state.accountId]);
   React.useEffect(() => {
     if (!state.accountId)
       return;
@@ -3528,7 +3628,6 @@ var usePrivateDataObserver = () => {
     const unsubscribe = ws.privateSubscribe("position", {
       onMessage: (data) => {
         const { positions: nextPostions } = data;
-        console.log("ws-----data-----", data);
         mutate2(key, (prevPositions) => {
           if (!!prevPositions) {
             return {
@@ -4216,7 +4315,6 @@ exports.useMutation = useMutation;
 exports.useOrderEntry = useOrderEntry;
 exports.useOrderStream = useOrderStream;
 exports.useOrderbookStream = useOrderbookStream;
-exports.useOrderlyContext = useOrderlyContext;
 exports.usePositionStream = usePositionStream;
 exports.usePreLoadData = usePreLoadData;
 exports.usePrivateDataObserver = usePrivateDataObserver;