@orderly.network/hooks 0.0.9 → 0.0.10

package/dist/index.js

@@ -4,17 +4,16 @@ var React = require('react');
 var useSWR = require('swr');
 var net = require('@orderly.network/net');
 var useSWRMutation = require('swr/mutation');
-var core = require('@orderly.network/core');
 var useConstant = require('use-constant');
+var core = require('@orderly.network/core');
 var rxjsHooks = require('rxjs-hooks');
 var types = require('@orderly.network/types');
 var rxjs = require('rxjs');
 var operators = require('rxjs/operators');
 var ramda = require('ramda');
+var useSWRSubscription = require('swr/subscription');
 var utils = require('@orderly.network/utils');
-var formik = require('formik');
 var futures = require('@orderly.network/futures');
-var useSWRSubscription = require('swr/subscription');
 var useSWRInfinite = require('swr/infinite');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -104,26 +103,52 @@ var useQuery = (query, options) => {
     swrOptions
   );
 };
+var useAccountInstance = () => {
+  const { configStore, keyStore, walletAdapter } = React.useContext(OrderlyContext);
+  if (!configStore)
+    throw new Error("configStore is not defined, please use OrderlyProvider");
+  if (!keyStore) {
+    throw new Error(
+      "keyStore is not defined, please use OrderlyProvider and provide keyStore"
+    );
+  }
+  const account4 = useConstant__default.default(() => {
+    let account5 = core.SimpleDI.get("account");
+    if (!account5) {
+      account5 = new core.Account(configStore, keyStore, walletAdapter);
+      core.SimpleDI.registerByName("account", account5);
+    }
+    return account5;
+  });
+  return account4;
+};
+
+// src/useMutation.ts
 var fetcher2 = (url, options) => {
   return net.post(url, options.arg.data, {
     headers: __spreadValues({}, options.arg.signature)
   });
 };
-var useMutation = (url, options) => {
+var deleteFetcher = (url, options) => {
+  return net.del(url, options.arg.data, {
+    headers: __spreadValues({}, options.arg.signature)
+  });
+};
+var useMutation = (url, options, method = "POST") => {
   const { apiBaseUrl } = React.useContext(OrderlyContext);
   if (!url.startsWith("http")) {
     url = `${apiBaseUrl}${url}`;
   }
-  let account3 = core.SimpleDI.get("account");
-  const signer = account3.signer;
+  const account4 = useAccountInstance();
+  const signer = account4.signer;
   const { trigger, data, error, reset, isMutating } = useSWRMutation__default.default(
     url,
-    fetcher2,
+    method === "POST" ? fetcher2 : deleteFetcher,
     options
   );
   const mutation = (data2) => __async(void 0, null, function* () {
     const payload = {
-      method: "POST",
+      method,
       url,
       data: data2
     };
@@ -131,26 +156,28 @@ var useMutation = (url, options) => {
     return trigger({
       data: data2,
       signature: __spreadProps(__spreadValues({}, signature), {
-        "orderly-account-id": account3.accountId
+        "orderly-account-id": account4.accountId
       })
     });
   });
-  return {
+  return [
     mutation,
-    data,
-    error,
-    reset,
-    isMutating
-  };
+    {
+      data,
+      error,
+      reset,
+      isMutating
+    }
+  ];
 };
 var signatureMiddleware = (useSWRNext) => {
   const { apiBaseUrl } = React.useContext(OrderlyContext);
   return (key, fetcher4, config) => {
     try {
       const extendedFetcher = (url) => __async(void 0, null, function* () {
-        let account3 = core.SimpleDI.get("account");
+        let account4 = core.SimpleDI.get("account");
         let fullUrl = `${apiBaseUrl}${url}`;
-        const signer = account3.signer;
+        const signer = account4.signer;
         const payload = {
           method: "GET",
           url: fullUrl
@@ -158,7 +185,7 @@ var signatureMiddleware = (useSWRNext) => {
         const signature = yield signer.sign(payload);
         return fetcher4(fullUrl, {
           headers: __spreadProps(__spreadValues({}, signature), {
-            "orderly-account-id": account3.accountId
+            "orderly-account-id": account4.accountId
           })
         });
       });
@@ -170,7 +197,13 @@ var signatureMiddleware = (useSWRNext) => {
   };
 };
 var useAccount = () => {
-  const { configStore, keyStore, walletAdapter } = React.useContext(OrderlyContext);
+  const {
+    configStore,
+    keyStore,
+    walletAdapter,
+    onWalletConnect,
+    onWalletDisconnect
+  } = React.useContext(OrderlyContext);
   if (!configStore)
     throw new Error("configStore is not defined, please use OrderlyProvider");
   if (!keyStore) {
@@ -178,39 +211,58 @@ var useAccount = () => {
       "keyStore is not defined, please use OrderlyProvider and provide keyStore"
     );
   }
-  const account3 = useConstant__default.default(() => {
-    let account4 = core.SimpleDI.get("account");
-    if (!account4) {
-      account4 = new core.Account(configStore, keyStore, walletAdapter);
-      core.SimpleDI.registerByName("account", account4);
+  const account4 = useConstant__default.default(() => {
+    let account5 = core.SimpleDI.get("account");
+    if (!account5) {
+      account5 = new core.Account(configStore, keyStore, walletAdapter);
+      core.SimpleDI.registerByName("account", account5);
     }
-    return account4;
+    return account5;
   });
   const state = rxjsHooks.useObservable(
-    () => account3.state$,
-    account3.stateValue
+    () => account4.state$,
+    account4.stateValue
   );
   const login = React.useCallback(
     (address) => {
-      account3.login(address);
+      account4.login(address);
     },
-    [account3]
+    [account4]
+  );
+  const createOrderlyKey = React.useCallback(
+    (remember) => __async(void 0, null, function* () {
+      return account4.createOrderlyKey(remember ? 365 : 30);
+    }),
+    [account4]
   );
+  const createAccount = React.useCallback(() => __async(void 0, null, function* () {
+    return account4.createAccount();
+  }), [account4]);
+  const connect = React.useCallback(() => __async(void 0, null, function* () {
+    return onWalletConnect == null ? void 0 : onWalletConnect();
+  }), [account4]);
+  const disconnect = React.useCallback(() => __async(void 0, null, function* () {
+    return onWalletDisconnect == null ? void 0 : onWalletDisconnect();
+  }), [account4]);
   return {
     // account: state!,
-    account: account3,
+    account: account4,
     state,
     // info: {},
-    login
+    login,
+    createOrderlyKey,
+    createAccount,
+    disconnect,
+    connect
   };
 };
 var usePrivateQuery = (query, options) => {
   var _b;
   const _a = options || {}, { formatter } = _a, swrOptions = __objRest(_a, ["formatter"]);
-  const account3 = useAccount();
+  const account4 = useAccount();
   const middleware = Array.isArray(options == null ? void 0 : options.use) ? (_b = options == null ? void 0 : options.use) != null ? _b : [] : [];
   return useSWR__default.default(
-    () => account3.state.status >= types.AccountStatusEnum.SignedIn ? query : null,
+    () => account4.state.status >= types.AccountStatusEnum.EnableTrading ? query : null,
     // query,
     (url, init) => {
       return fetcher(url, init, { formatter });
@@ -297,7 +349,7 @@ var useWebSocketClient = () => {
     let websocketClient = core.SimpleDI.get(WS_NAME);
     if (!websocketClient) {
       websocketClient = new net.WebSocketClient({
-        accountId: "0x47ab075adca7dfe9dd206eb7c50a10f7b99f4f08fa6c3abd4c170d438e15093b",
+        accountId: "OqdphuyCtYWxwzhxyLLjOWNdFP7sQt8RPWzmb5xY",
         networkId: "testnet",
         onSigntureRequest: (accountId) => __async(void 0, null, function* () {
           const signer = core.getMockSigner();
@@ -312,28 +364,6 @@ var useWebSocketClient = () => {
   });
   return ws;
 };
-var useAccountInstance = () => {
-  const { configStore, keyStore } = React.useContext(OrderlyContext);
-  if (!configStore)
-    throw new Error("configStore is not defined, please use OrderlyProvider");
-  if (!keyStore) {
-    throw new Error(
-      "keyStore is not defined, please use OrderlyProvider and provide keyStore"
-    );
-  }
-  const account3 = useConstant__default.default(() => {
-    let account4 = core.SimpleDI.get("account");
-    if (!account4) {
-      account4 = new core.Account(configStore, keyStore);
-      core.SimpleDI.registerByName("account", account4);
-    }
-    return account4;
-  });
-  console.log("account instance ======>>>>>", account3);
-  return account3;
-};
-
-// src/provider/dataProvider.tsx
 var DataSourceContext = React.createContext({});
 var DataSourceProvider = (props) => {
   console.log("render DataSourceProvider");
@@ -346,12 +376,13 @@ var WS_NAME2 = "nativeWebsocketClient";
 var useWS = () => {
   const ws = useConstant__default.default(() => {
     let websocketClient = core.SimpleDI.get(WS_NAME2);
+    const account4 = core.SimpleDI.get(core.Account.instanceName);
     if (!websocketClient) {
       websocketClient = new net.WS({
-        accountId: "0x47ab075adca7dfe9dd206eb7c50a10f7b99f4f08fa6c3abd4c170d438e15093b",
+        // accountId: "OqdphuyCtYWxwzhxyLLjOWNdFP7sQt8RPWzmb5xY",
         networkId: "testnet",
         onSigntureRequest: (accountId) => __async(void 0, null, function* () {
-          const signer = core.getMockSigner();
+          const signer = account4.signer;
           const timestamp = (/* @__PURE__ */ new Date()).getTime();
           const result = yield signer.signText(timestamp.toString());
           return __spreadProps(__spreadValues({}, result), { timestamp });
@@ -368,34 +399,69 @@ var useTickerStream = (symbol) => {
     throw new Error("useFuturesForSymbol requires a symbol");
   }
   const { data: info } = useQuery(`/public/futures/${symbol}`);
-  const ws = useWebSocketClient();
-  const ticker = rxjsHooks.useObservable(
-    (_, input$) => input$.pipe(
-      operators.map(([config]) => config),
-      operators.combineLatestWith(ws.observe(`${symbol}@ticker`).pipe(operators.startWith({}))),
-      operators.map(([config, ticker2]) => {
-        if (!config)
-          return config;
-        if (ticker2.close !== void 0) {
-          config["24h_close"] = ticker2.close;
-        }
-        if (ticker2.open !== void 0) {
-          config["24h_open"] = ticker2.open;
-        }
-        if (ticker2.volume !== void 0) {
-          config["24h_volumn"] = ticker2.volume;
-        }
-        if (ticker2.close !== void 0 && ticker2.open !== void 0) {
-          config["change"] = new utils.Decimal(ticker2.close).minus(ticker2.open).div(ticker2.open).toNumber();
+  const ws = useWS();
+  const { data: ticker } = useSWRSubscription__default.default(
+    `${symbol}@ticker`,
+    (key, { next }) => {
+      const unsubscribe = ws.subscribe(
+        // { event: "subscribe", topic: "markprices" },
+        `${symbol}@ticker`,
+        {
+          onMessage: (message) => {
+            next(null, message);
+          }
+          // onUnsubscribe: () => {
+          //   return "markprices";
+          // },
+          // onError: (error: any) => {
+          //   console.log("error", error);
+          // },
         }
-        return config;
-      })
-    ),
-    null,
-    [info]
+      );
+      return () => {
+        console.log("unsubscribe!!!!!!!");
+        unsubscribe == null ? void 0 : unsubscribe();
+      };
+    }
   );
-  return ticker;
+  const value = React.useMemo(() => {
+    if (!info)
+      return null;
+    if (!ticker)
+      return info;
+    const config = __spreadValues({}, info);
+    if (ticker.close !== void 0) {
+      config["24h_close"] = ticker.close;
+    }
+    if (ticker.open !== void 0) {
+      config["24h_open"] = ticker.open;
+    }
+    if (ticker.volume !== void 0) {
+      config["24h_volumn"] = ticker.volume;
+    }
+    if (ticker.close !== void 0 && ticker.open !== void 0) {
+      config["change"] = new utils.Decimal(ticker.close).minus(ticker.open).div(ticker.open).toNumber();
+    }
+    return config;
+  }, [info, ticker]);
+  return value;
 };
+var useMarkPrice = (symbol) => {
+  const ws = useWS();
+  return useSWRSubscription__default.default(`${symbol}@markprice`, (key, { next }) => {
+    const unsubscribe = ws.subscribe(`${symbol}@markprice`, {
+      onMessage: (message) => {
+        next(null, message.price);
+      }
+    });
+    return () => {
+      console.log("unsubscribe useMarkPrice !!!!!!!");
+      unsubscribe == null ? void 0 : unsubscribe();
+    };
+  });
+};
+
+// src/orderly/useOrderbookStream.ts
 ramda.compose(ramda.defaultTo(0), ramda.head, ramda.last, ramda.pathOr([], ["asks"]));
 ramda.pathOr(0, ["bids", 0, 0]);
 var paddingFn = (len) => Array(len).fill([Number.NaN, Number.NaN, Number.NaN]);
@@ -408,7 +474,13 @@ var reduceItems = (depth, level, data) => {
   const result = [];
   for (let i = 0; i < data.length; i++) {
     const [price, quantity] = data[i];
-    result.push([price, quantity, quantity + (i > 0 ? result[i - 1][2] : 0)]);
+    if (isNaN(price) || isNaN(quantity))
+      continue;
+    result.push([
+      price,
+      quantity,
+      quantity + (result.length > 0 ? result[result.length - 1][2] : 0)
+    ]);
     if (i + 1 >= level) {
       break;
     }
@@ -454,21 +526,22 @@ var mergeOrderbook = (data, update) => {
     bids: mergeItems(data.bids, update.bids).sort(bidsSortFn)
   };
 };
-var useOrderbook = (symbol, initial = { asks: [], bids: [] }, options) => {
+var useOrderbookStream = (symbol, initial = { asks: [], bids: [] }, options) => {
   if (!symbol) {
-    throw new Error("useOrderbook requires a symbol");
+    throw new Error("useOrderbookStream requires a symbol");
   }
+  const [requestData, setRequestData] = React.useState(null);
   const [data, setData] = React.useState(initial);
+  const [isLoading, setIsLoading] = React.useState(true);
   const [depth, setDepth] = React.useState(1e-3);
   const [level, setLevel] = React.useState(() => {
     var _a;
     return (_a = options == null ? void 0 : options.level) != null ? _a : 10;
   });
-  const ws = useWebSocketClient();
-  const orderbookSubscriberRef = React.useRef();
+  const ws = useWS();
   const ticker = useTickerStream(symbol);
-  const orderbookRequest$ = React.useMemo(() => {
-    return ws.observe(
+  React.useEffect(() => {
+    ws.onceSubscribe(
       {
         event: "request",
         params: {
@@ -476,66 +549,52 @@ var useOrderbook = (symbol, initial = { asks: [], bids: [] }, options) => {
           symbol
         }
       },
-      void 0,
-      (message) => message.event === "request"
-    );
-  }, [symbol]);
-  const orderbookUpdate$ = React.useMemo(() => {
-    return ws.observe(`${symbol}@orderbookupdate`, () => ({
-      event: "subscribe",
-      topic: `${symbol}@orderbookupdate`
-    })).pipe(
-      operators.startWith({ asks: [], bids: [] })
-      // filter((message: any) => !!message.success)
+      {
+        onMessage: (message) => {
+          console.log("orderbook request message", message);
+          if (!!message) {
+            const reduceOrderbookData = reduceOrderbook(depth, level, message);
+            setRequestData(reduceOrderbookData);
+            setData(reduceOrderbookData);
+          }
+          setIsLoading(false);
+        }
+      }
     );
+    return () => {
+      setRequestData(null);
+    };
   }, [symbol]);
-  const orderbookOptions$ = useConstant__default.default(() => {
-    return new rxjs.BehaviorSubject({
-      depth: 1e-3,
-      level: 10
-    });
-  });
-  const markPrice = rxjsHooks.useObservable(
-    (_, input$) => input$.pipe(
-      operators.debounceTime(200),
-      operators.switchMap(([symbol2]) => {
-        return ws.observe(`${symbol2}@markprice`).pipe(operators.map((data2) => data2.price));
-      })
-    ),
-    0,
-    [symbol]
-  );
+  const { data: markPrice } = useMarkPrice(symbol);
   React.useEffect(() => {
-    if (orderbookSubscriberRef.current) {
-      orderbookSubscriberRef.current.unsubscribe();
-    }
-    orderbookSubscriberRef.current = rxjs.merge(orderbookRequest$, orderbookUpdate$).pipe(
-      // tap((data) => console.log(data)),
-      operators.map(
-        (data2) => ramda.pick(["asks", "bids"], data2)
-      ),
-      operators.scan((acc, curr) => {
-        if (!acc.asks && !acc.bids) {
-          return curr;
+    if (!requestData)
+      return;
+    const subscription = ws.subscribe(
+      {
+        event: "subscribe",
+        topic: `${symbol}@orderbookupdate`
+      },
+      {
+        onMessage: (message) => {
+          setData((data2) => {
+            const mergedData = !message.asks && !message.bids ? data2 : mergeOrderbook(data2, message);
+            const reducedData = reduceOrderbook(depth, level, mergedData);
+            return reducedData;
+          });
         }
-        return mergeOrderbook(acc, curr);
-      }),
-      operators.map((data2) => reduceOrderbook(depth, level, data2))
-    ).subscribe((data2) => {
-      setData(data2);
-    });
-  }, [orderbookRequest$, orderbookUpdate$]);
+      }
+    );
+    return () => {
+      subscription == null ? void 0 : subscription();
+    };
+  }, [symbol, requestData]);
   const onDepthChange = React.useCallback((depth2) => {
     console.log("Orderbook depth has changed:", depth2);
-    orderbookOptions$.next(__spreadProps(__spreadValues({}, orderbookOptions$.value), {
-      depth: depth2
-      // level,
-    }));
   }, []);
   const middlePrice = React.useMemo(() => {
     let asksFrist = 0, bidsFirst = 0;
     if (data.asks.length > 0) {
-      asksFrist = data.asks[data.bids.length - 1][0];
+      asksFrist = data.asks[data.asks.length - 1][0];
     }
     if (data.bids.length > 0) {
       bidsFirst = data.bids[0][0];
@@ -546,7 +605,7 @@ var useOrderbook = (symbol, initial = { asks: [], bids: [] }, options) => {
   }, [ticker, data]);
   return [
     __spreadProps(__spreadValues({}, data), { markPrice, middlePrice }),
-    { onDepthChange, depth }
+    { onDepthChange, depth, isLoading }
   ];
 };
 
@@ -650,14 +709,15 @@ function orderEntityFormatHandle(baseTick, quoteTick) {
 }
 function priceInputHandle(inputs) {
   const [values, input, value, markPrice, config] = inputs;
+  console.log("priceInputHandle", inputs);
   if (value === "") {
     return [__spreadProps(__spreadValues({}, values), { total: "" }), input, value, markPrice, config];
   }
   const price = new utils.Decimal(value);
   const priceDP = price.dp();
+  console.log("priceInputHandle", priceDP, config.quoteDP);
   if (priceDP > config.quoteDP) {
-    price.toDecimalPlaces(config.quoteDP);
-    values.order_price = price.toNumber();
+    values.order_price = price.toDecimalPlaces(config.quoteDP).toString();
   }
   price.toDecimalPlaces(Math.min(priceDP, config.quoteDP));
   if (!values.order_quantity) {
@@ -665,9 +725,10 @@ function priceInputHandle(inputs) {
   }
   const total = price.mul(values.order_quantity);
   const quantityDP = total.dp();
-  total.toDecimalPlaces(Math.min(quantityDP, config.baseDP));
   return [
-    __spreadProps(__spreadValues({}, values), { total: total.toNumber() }),
+    __spreadProps(__spreadValues({}, values), {
+      total: total.toDecimalPlaces(Math.min(quantityDP, config.baseDP)).toString()
+    }),
     input,
     value,
     markPrice,
@@ -691,10 +752,9 @@ function quantityInputHandle(inputs) {
   }
   const total = quantity.mul(price);
   const totalDP = total.dp();
-  total.todp(Math.min(config.quoteDP, totalDP));
   return [
     __spreadProps(__spreadValues({}, values), {
-      total: total.toNumber()
+      total: total.todp(Math.min(config.quoteDP, totalDP)).toNumber()
     }),
     input,
     value,
@@ -770,25 +830,12 @@ var useFundingRates = () => {
   );
   return createGetter(data);
 };
-var useMarkPricesSubject = () => {
-  const ws = useWebSocketClient();
-  return useConstant__default.default(
-    () => ws.observe("markprices").pipe(
-      operators.map((data) => {
-        const prices = {};
-        data.forEach((item) => {
-          prices[item.symbol] = item.price;
-        });
-        return prices;
-      })
-    )
-  );
-};
 var useMarkPricesStream = () => {
   const ws = useWS();
   return useSWRSubscription__default.default("markPrices", (key, { next }) => {
-    const unsubscribe = ws.subscription(
-      { event: "subscribe", topic: "markprices" },
+    const unsubscribe = ws.subscribe(
+      // { event: "subscribe", topic: "markprices" },
+      "markprices",
       {
         onMessage: (message) => {
           const data = /* @__PURE__ */ Object.create(null);
@@ -798,9 +845,9 @@ var useMarkPricesStream = () => {
           }
           next(null, data);
         },
-        onUnsubscribe: () => {
-          return "markprices";
-        },
+        // onUnsubscribe: () => {
+        //   return "markprices";
+        // },
         onError: (error) => {
           console.log("error", error);
         }
@@ -808,36 +855,34 @@ var useMarkPricesStream = () => {
     );
     return () => {
       console.log("unsubscribe!!!!!!!");
-      console.log("unsubscribe", unsubscribe);
       unsubscribe == null ? void 0 : unsubscribe();
     };
   });
 };
 var usePositionStream = (symbol, options) => {
-  React.useState(false);
   const [visibledSymbol, setVisibleSymbol] = React.useState(
     symbol
   );
   const symbolInfo = useSymbolsInfo();
   const { data: accountInfo } = usePrivateQuery("/client/info");
-  const { mutation } = useMutation("/order");
   const fundingRates = useFundingRates();
-  useMarkPricesSubject();
-  const { data, error, isLoading } = usePrivateQuery(
-    `/positions`,
-    __spreadProps(__spreadValues({}, options), {
-      formatter: (data2) => data2,
-      onError: (err) => {
-        console.log("usePositionStream error", err);
-      }
-    })
-  );
+  const { data, error } = usePrivateQuery(`/positions`, __spreadProps(__spreadValues({}, options), {
+    formatter: (data2) => data2,
+    onError: (err) => {
+      console.log("usePositionStream error", err);
+    }
+  }));
   const { data: markPrices } = useMarkPricesStream();
   const formatedPositions = React.useMemo(() => {
     if (!(data == null ? void 0 : data.rows) || !symbolInfo || !accountInfo)
       return null;
     let totalCollateral = 0;
-    return data.rows.map((item) => {
+    const filteredData = typeof symbol === "undefined" || symbol === "" ? data.rows.filter((item) => {
+      return item.position_qty !== 0;
+    }) : data.rows.filter((item) => {
+      return item.symbol === symbol && item.position_qty !== 0;
+    });
+    return filteredData.map((item) => {
       const price = ramda.propOr(
         item.mark_price,
         item.symbol,
@@ -873,7 +918,7 @@ var usePositionStream = (symbol, options) => {
         })
       });
     });
-  }, [data == null ? void 0 : data.rows, symbolInfo, accountInfo, markPrices]);
+  }, [data == null ? void 0 : data.rows, symbolInfo, accountInfo, markPrices, symbol]);
   const aggregatedData = React.useMemo(() => {
     const aggregatedData2 = {
       unsettledPnL: NaN,
@@ -901,18 +946,11 @@ var usePositionStream = (symbol, options) => {
   const showSymbol = React.useCallback((symbol2) => {
     setVisibleSymbol(symbol2);
   }, []);
-  const onClosePosition = React.useCallback(
-    (order2) => {
-      return mutation(order2).finally(() => {
-      });
-    },
-    []
-  );
   return [
     { rows: formatedPositions, aggregated: aggregatedData },
     createGetter(data, 1),
     {
-      close: onClosePosition,
+      // close: onClosePosition,
       loading: false,
       showSymbol,
       error,
@@ -927,7 +965,8 @@ var usePositionStream = (symbol, options) => {
 };
 var totalUnsettlementPnLPath = ramda.pathOr(0, [0, "aggregated", "unsettledPnL"]);
 var positionsPath = ramda.pathOr([], [0, "rows"]);
-var useCollateral = (dp = 6) => {
+var useCollateral = (options = { dp: 6 }) => {
+  const { dp } = options;
   const positions2 = usePositionStream();
   const { data: orders } = usePrivateQuery(`/orders`);
   const { data: accountInfo } = usePrivateQuery("/client/info");
@@ -1081,7 +1120,7 @@ var BaseOrderCreator = class {
   baseOrder(data) {
     const order2 = {
       // symbol: data.symbol,
-      order_type: !!data.order_type_ext ? data.order_type_ext : data.order_type,
+      order_type: data.order_type === types.OrderType.LIMIT ? !!data.order_type_ext ? data.order_type_ext : data.order_type : data.order_type,
       side: data.side,
       // reduce_only: data.reduce_only,
       order_quantity: data.order_quantity
@@ -1094,25 +1133,41 @@ var BaseOrderCreator = class {
   baseValidate(values, configs) {
     const errors = {};
     const { maxQty } = configs;
+    console.log("baseValidate", values, configs);
     const { order_quantity, total } = values;
     if (!order_quantity) {
-      errors.order_quantity = "quantity is required";
+      errors.order_quantity = {
+        type: "required",
+        message: "quantity is required"
+      };
     } else {
       const { base_max, base_min } = configs.symbol;
       const qty = new utils.Decimal(order_quantity);
       if (qty.lt(base_min)) {
-        errors.order_quantity = `quantity must be greater than ${base_min}`;
+        errors.order_quantity = {
+          type: "min",
+          message: `quantity must be greater than ${base_min}`
+        };
       } else if (qty.gt(maxQty)) {
-        errors.order_quantity = `quantity must be less than ${base_max}`;
+        errors.order_quantity = {
+          type: "max",
+          message: `quantity must be less than ${maxQty}`
+        };
       }
     }
     if (!!total) {
       const { quote_max, quote_min } = configs.symbol;
       const totalNumber = new utils.Decimal(total);
       if (totalNumber.lt(quote_min)) {
-        errors.total = `Quantity should be greater than ${quote_min}`;
+        errors.total = {
+          type: "min",
+          message: `Quantity should be greater or equal than ${quote_min}`
+        };
       } else if (totalNumber.gt(quote_max)) {
-        errors.total = `Quantity should be less or equal than ${quote_max}`;
+        errors.total = {
+          type: "max",
+          message: `Quantity should be less or equal than ${quote_max}`
+        };
       }
     }
     return Promise.resolve(errors);
@@ -1128,7 +1183,10 @@ var LimitOrderCreator = class extends BaseOrderCreator {
     return this.baseValidate(values, config).then((errors) => {
       const { order_price } = values;
       if (!order_price) {
-        errors.order_price = "price is required";
+        errors.order_price = {
+          type: "required",
+          message: "price is required"
+        };
       } else {
         const price = new utils.Decimal(order_price);
         const { symbol } = config;
@@ -1136,9 +1194,15 @@ var LimitOrderCreator = class extends BaseOrderCreator {
         const maxPriceNumber = maxPrice(config.markPrice, price_range);
         const minPriceNumber = minPrice(config.markPrice, price_range);
         if (price.lt(minPriceNumber)) {
-          errors.order_price = `price must be greater than ${minPriceNumber}`;
+          errors.order_price = {
+            type: "min",
+            message: `price must be greater than ${minPriceNumber}`
+          };
         } else if (price.gt(maxPriceNumber)) {
-          errors.order_price = `price must be less than ${maxPriceNumber}`;
+          errors.order_price = {
+            type: "max",
+            message: `price must be less than ${maxPriceNumber}`
+          };
         }
       }
       return errors;
@@ -1147,7 +1211,9 @@ var LimitOrderCreator = class extends BaseOrderCreator {
 };
 var MarketOrderCreator = class extends BaseOrderCreator {
   create(values) {
-    return __spreadValues({}, this.baseOrder(values));
+    const data = this.baseOrder(values);
+    delete data["order_price"];
+    return __spreadValues({}, data);
   }
   validate(values, configs) {
     return this.baseValidate(values, configs);
@@ -1171,8 +1237,8 @@ var GeneralOrderCreator = class extends BaseOrderCreator {
   }
 };
 var OrderFactory = class {
-  static create(type2) {
-    switch (type2) {
+  static create(type) {
+    switch (type) {
       case types.OrderType.LIMIT:
         return new LimitOrderCreator();
       case types.OrderType.MARKET:
@@ -1190,8 +1256,8 @@ var OrderFactory = class {
 };
 
 // src/orderly/useOrderEntry.ts
-var useOrderEntry = (symbol, initialValue = {}, options) => {
-  const { mutation } = useMutation("/order");
+var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
+  const [mutation] = useMutation("/order");
   const { freeCollateral } = useCollateral();
   const symbolInfo = useSymbolsInfo();
   const tokenInfo = useTokenInfo();
@@ -1202,97 +1268,29 @@ var useOrderEntry = (symbol, initialValue = {}, options) => {
   const quoteDP = React.useMemo(() => {
     return tokenInfo.USDC("decimals", 0);
   }, [tokenInfo]);
-  const [valuesUpdate, [orderExtraValues]] = rxjsHooks.useEventCallback(
-    (event$, state$) => {
-      return event$.pipe(
-        operators.withLatestFrom(state$),
-        operators.map(([event, state]) => {
-          const { field, value } = event;
-          console.log("orderExtraValues", field, value);
-          return [__spreadProps(__spreadValues({}, state[0]), { [field]: value })];
-        })
-      );
-    },
-    [
-      {
-        order_type: types.OrderType.MARKET,
-        side: types.OrderSide.BUY,
-        reduce_only: false
-      }
-    ]
-  );
-  const ws = useWebSocketClient();
-  const markPrice = rxjsHooks.useObservable(
-    (_, input$) => input$.pipe(
-      operators.switchMap(([symbol2]) => {
-        return ws.observe(`${symbol2}@markprice`).pipe(
-          operators.map((data) => data.price)
-          // takeWhile(() => type === OrderType.MARKET)
-        );
-      })
-    ),
-    0,
-    [symbol]
-  );
-  const formik$1 = formik.useFormik({
-    initialValues: __spreadValues({
-      // order_type: OrderType.MARKET,
-      // side: OrderSide.BUY,
-      order_quantity: "",
-      total: "",
-      order_price: "",
-      visible_quantity: 1
-    }, initialValue),
-    validate: (values) => {
-      const creator = OrderFactory.create(orderExtraValues.order_type);
-      return creator == null ? void 0 : creator.validate(values, {
-        symbol: symbolInfo[symbol](),
-        token: tokenInfo[symbol](),
-        maxQty,
-        markPrice
-      });
-    },
-    onSubmit: (values) => {
-      console.log(values);
-    }
-  });
+  const { data: markPrice } = useMarkPrice(symbol);
   const maxQty = useMaxQty(
     symbol,
-    orderExtraValues.side,
-    orderExtraValues.reduce_only
+    side,
+    // orderExtraValues.reduce_only
+    reduceOnly
   );
-  const formFieldds = React.useMemo(() => {
-    return ["order_quantity", "order_price", "total"];
-  }, []);
-  const setValue = (field, value) => {
-    if (formFieldds.indexOf(field) < 0) {
-      valuesUpdate({ field, value });
-      return;
-    }
-    const fieldHandler = getCalculateHandler(field);
-    const newValues = ramda.compose(
-      ramda.head,
-      orderEntityFormatHandle(),
-      fieldHandler,
-      baseInputHandle
-    )([
-      __spreadValues(__spreadValues({}, formik$1.values), orderExtraValues),
-      field,
-      value,
-      markPrice,
-      { baseDP, quoteDP }
-    ]);
-    formik$1.setValues(newValues, true);
-  };
   const onSubmit = (values) => {
-    values = values || formik$1.values;
-    if (typeof values.order_type === "undefined" || values.order_type !== types.OrderType.MARKET && values.order_type !== types.OrderType.LIMIT) {
+    if (!values || typeof values.order_type === "undefined" || values.order_type !== types.OrderType.MARKET && values.order_type !== types.OrderType.LIMIT) {
       throw new Error("order_type is error");
     }
-    return Promise.resolve().then(() => {
-      const orderCreator = OrderFactory.create(
-        !!values.order_type_ext ? values.order_type_ext : values.order_type
-      );
+    const orderCreator = OrderFactory.create(
+      !!values.order_type_ext ? values.order_type_ext : values.order_type
+    );
+    if (!orderCreator) {
+      return Promise.reject(new Error("orderCreator is null"));
+    }
+    return orderCreator == null ? void 0 : orderCreator.validate(values, {
+      symbol: symbolInfo[symbol](),
+      token: tokenInfo[symbol](),
+      maxQty,
+      markPrice
+    }).then(() => {
       if (!orderCreator) {
         throw new Error("orderCreator is null");
       }
@@ -1300,31 +1298,43 @@ var useOrderEntry = (symbol, initialValue = {}, options) => {
         throw new Error("symbol is null");
       }
       const data = orderCreator.create(values);
-      console.log("orderentry data:::", data);
-      formik$1.setSubmitting(true);
       return mutation(__spreadProps(__spreadValues({}, data), {
         symbol
-      })).finally(() => {
-        formik$1.setSubmitting(false);
-      });
+      }));
+    });
+  };
+  const calculate = React.useCallback(
+    (values, field, value) => {
+      console.log("calculate", values, field, value, markPrice);
+      const fieldHandler = getCalculateHandler(field);
+      const newValues = ramda.compose(
+        ramda.head,
+        orderEntityFormatHandle(),
+        fieldHandler,
+        baseInputHandle
+      )([values, field, value, markPrice, { baseDP, quoteDP }]);
+      return newValues;
+    },
+    [markPrice]
+  );
+  const validator = (values) => {
+    const creator = OrderFactory.create(values.order_type);
+    return creator == null ? void 0 : creator.validate(values, {
+      symbol: symbolInfo[symbol](),
+      token: tokenInfo[symbol](),
+      maxQty,
+      markPrice
     });
   };
-  React.useEffect(() => {
-    formik$1.resetForm();
-  }, [symbol]);
   return {
     maxQty,
-    // formState,
-    values: __spreadValues(__spreadValues({}, formik$1.values), orderExtraValues),
-    errors: formik$1.errors,
     freeCollateral,
     markPrice,
-    setValue,
     onSubmit,
-    isSubmitting: formik$1.isSubmitting,
-    resetForm: formik$1.resetForm,
-    validateForm: formik$1.validateForm,
-    submitCount: formik$1.submitCount,
+    helper: {
+      calculate,
+      validator
+    },
     symbolConfig: symbolInfo[symbol]()
   };
 };
@@ -1367,35 +1377,49 @@ var useAccountInfo = () => {
   return usePrivateQuery("/client/info");
 };
 var useMarketsStream = () => {
-  const ws = useWebSocketClient();
-  const { data } = useQuery(`/public/futures`);
-  const value = rxjsHooks.useObservable(
-    (_, input$) => ws.observe("tickers").pipe(
-      operators.startWith([]),
-      operators.withLatestFrom(input$.pipe(operators.map((args) => args[0]))),
-      operators.map((args) => {
-        if (args[0].length === 0) {
-          return args[1];
+  const ws = useWS();
+  const { data: futures } = useQuery(`/public/futures`);
+  const { data: tickers } = useSWRSubscription__default.default("tickers", (_, { next }) => {
+    const unsubscribe = ws.subscribe(
+      // { event: "subscribe", topic: "markprices" },
+      "tickers",
+      {
+        onMessage: (message) => {
+          next(null, message);
         }
-        return args[1].map((item) => {
-          const ticker = args[0].find(
-            (t) => t.symbol === item.symbol
-          );
-          if (ticker) {
-            return __spreadProps(__spreadValues({}, item), {
-              ["24h_close"]: ticker.close,
-              ["24h_open"]: ticker.open,
-              ["24h_volumn"]: ticker.volume,
-              change: 0
-            });
-          }
-          return item;
+        // onUnsubscribe: () => {
+        //   return "markprices";
+        // },
+        // onError: (error: any) => {
+        //   console.log("error", error);
+        // },
+      }
+    );
+    return () => {
+      console.log("unsubscribe!!!!!!!");
+      unsubscribe == null ? void 0 : unsubscribe();
+    };
+  });
+  const value = React.useMemo(() => {
+    if (!futures)
+      return null;
+    if (!tickers)
+      return futures;
+    return futures.map((item) => {
+      const ticker = tickers.find(
+        (t) => t.symbol === item.symbol
+      );
+      if (ticker) {
+        return __spreadProps(__spreadValues({}, item), {
+          ["24h_close"]: ticker.close,
+          ["24h_open"]: ticker.open,
+          ["24h_volumn"]: ticker.volume,
+          change: 0
         });
-      })
-    ),
-    null,
-    [data]
-  );
+      }
+      return item;
+    });
+  }, [futures, tickers]);
   return { data: value };
 };
 var useFundingRate = (symbol) => {
@@ -1436,10 +1460,10 @@ var useFundingRate = (symbol) => {
 var fetcher3 = (url, init) => net.get(url, init);
 var usePrivateInfiniteQuery = (getKey, options) => {
   var _a;
-  const account3 = useAccount();
+  const account4 = useAccount();
   const middleware = Array.isArray(options == null ? void 0 : options.use) ? (_a = options == null ? void 0 : options.use) != null ? _a : [] : [];
   const result = useSWRInfinite__default.default(
-    (pageIndex, previousPageData) => account3.state.status >= types.AccountStatusEnum.SignedIn ? getKey(pageIndex, previousPageData) : null,
+    (pageIndex, previousPageData) => account4.state.status >= types.AccountStatusEnum.EnableTrading ? getKey(pageIndex, previousPageData) : null,
     fetcher3,
     __spreadProps(__spreadValues({}, options), {
       use: [signatureMiddleware, ...middleware]
@@ -1484,7 +1508,6 @@ var useOrderStream = ({
     if (!res.data) {
       return null;
     }
-    console.log("orders:::", markPrices);
     return (_a = res.data) == null ? void 0 : _a.flat().map((item) => {
       var _a2;
       return __spreadProps(__spreadValues({}, item), {
@@ -1514,6 +1537,77 @@ var useOrderStream = ({
   ];
 };
 
+// src/orderly/useTradeStream.ts
+var useTradeStream = (symbol) => {
+  if (!symbol) {
+    throw new Error("useTradeStream: symbol is required");
+  }
+  const { data, isLoading } = useQuery(
+    `/public/market_trades?symbol=${symbol}&limit=20`
+  );
+  return { data, isLoading };
+};
+var useMarginRatio = () => {
+  const [{ rows }] = usePositionStream();
+  const { data: markPrices } = useMarkPricesStream();
+  const { totalCollateral } = useCollateral();
+  const marginRatio = React.useMemo(() => {
+    const ratio = futures.account.totalMarginRatio({
+      totalCollateral,
+      markPrices,
+      positions: rows != null ? rows : []
+    });
+    return ratio;
+  }, [rows, markPrices, totalCollateral]);
+  return marginRatio;
+};
+var useChains = (networkId, options) => {
+  const field = options == null ? void 0 : options.pick;
+  const { data } = useSWR__default.default(
+    "https://fi-api.woo.org/swap_support",
+    (url) => fetch(url).then((res) => res.json()),
+    {
+      revalidateOnFocus: false,
+      revalidateOnReconnect: false
+    }
+  );
+  const chains = React.useMemo(() => {
+    if (!data || !data.data)
+      return data;
+    let arr = [];
+    Object.keys(data.data).forEach((key) => {
+      const item = data.data[key];
+      arr.push(__spreadProps(__spreadValues({}, item), {
+        name: key
+      }));
+    });
+    if (networkId === "mainnet") {
+      arr = arr.filter((item) => item.network_infos.mainnet);
+    }
+    if (networkId === "testnet") {
+      arr = arr.filter((item) => !item.network_infos.mainnet);
+    }
+    if (typeof (options == null ? void 0 : options.filter) === "function") {
+      arr = arr.filter(options.filter);
+    }
+    if (typeof field !== "undefined") {
+      return arr.map((item) => {
+        return item[field];
+      });
+    }
+    return arr;
+  }, [data, networkId, field, options]);
+  const findByChainId = React.useCallback(
+    (chainId) => {
+      if (!data || !data.data)
+        return void 0;
+      return data.data[chainId];
+    },
+    [data]
+  );
+  return [chains, { findByChainId }];
+};
+
 // src/apis/index.ts
 var apis_exports = {};
 __export(apis_exports, {
@@ -1572,16 +1666,19 @@ exports.apis = apis_exports;
 exports.useAccount = useAccount;
 exports.useAccountInfo = useAccountInfo;
 exports.useAppState = useAppState;
+exports.useChains = useChains;
 exports.useCollateral = useCollateral;
 exports.useFetures = useFetures;
 exports.useFundingRate = useFundingRate;
+exports.useMarginRatio = useMarginRatio;
+exports.useMarkPrice = useMarkPrice;
 exports.useMarkPricesStream = useMarkPricesStream;
 exports.useMarketsStream = useMarketsStream;
 exports.useMaxQty = useMaxQty;
 exports.useMutation = useMutation;
 exports.useOrderEntry = useOrderEntry;
 exports.useOrderStream = useOrderStream;
-exports.useOrderbook = useOrderbook;
+exports.useOrderbookStream = useOrderbookStream;
 exports.usePositionStream = usePositionStream;
 exports.usePrivateObserve = usePrivateObserve;
 exports.usePrivateQuery = usePrivateQuery;
@@ -1590,6 +1687,7 @@ exports.useSymbolsInfo = useSymbolsInfo;
 exports.useTickerStream = useTickerStream;
 exports.useTokenInfo = useTokenInfo;
 exports.useTopicObserve = useTopicObserve;
+exports.useTradeStream = useTradeStream;
 exports.useTradingView = useTradingView;
 exports.useWS = useWS;
 exports.useWebSocketClient = useWebSocketClient;