@orderly.network/hooks 0.0.71 → 0.0.73

package/dist/index.d.mts

@@ -416,6 +416,7 @@ declare const useWooCrossSwapQuery: () => {
         srcToken: string;
         amount: bigint;
         slippage: number;
+        dstToken: string;
         crossChainRouteAddress: string;
     }) => Promise<any> | undefined;
     loading: boolean;

package/dist/index.d.ts

@@ -416,6 +416,7 @@ declare const useWooCrossSwapQuery: () => {
         srcToken: string;
         amount: bigint;
         slippage: number;
+        dstToken: string;
         crossChainRouteAddress: string;
     }) => Promise<any> | undefined;
     loading: boolean;

package/dist/index.js

@@ -60,7 +60,6 @@ var useLazyQuery = (query, options) => {
   return useSWRMutation__default.default(
     query,
     (url, options2) => {
-      console.log(url, options2);
       url = url.startsWith("http") ? url : `${apiBaseUrl}${url}`;
       if (options2?.arg) {
         const queryString = Object.entries(options2.arg).map(
@@ -264,7 +263,6 @@ var usePrivateQuery = (query, options) => {
       ...swrOptions,
       use: [signatureMiddleware, ...middleware],
       onError: (err) => {
-        console.log("usePrivateQuery error", err);
       }
     }
   );
@@ -334,7 +332,6 @@ function parseJSON(value) {
   try {
     return value === "undefined" ? void 0 : JSON.parse(value ?? "");
   } catch {
-    console.log("parsing error on", { value });
     return void 0;
   }
 }
@@ -443,7 +440,6 @@ var useRunOnce = ({ fn, sessionKey }) => {
 };
 var DataSourceContext = React2.createContext({});
 var DataSourceProvider = (props) => {
-  console.log("render DataSourceProvider");
   useAccountInstance();
   useConstant__default.default(() => {
   });
@@ -509,12 +505,11 @@ var useTickerStream = (symbol) => {
           //   return "markprices";
           // },
           // onError: (error: any) => {
-          //   console.log("error", error);
+          //
           // },
         }
       );
       return () => {
-        console.log("unsubscribe!!!!!!!");
         unsubscribe?.();
       };
     }
@@ -550,7 +545,6 @@ var useMarkPrice = (symbol) => {
       }
     });
     return () => {
-      console.log("unsubscribe useMarkPrice !!!!!!!");
       unsubscribe?.();
     };
   });
@@ -671,7 +665,6 @@ var mergeItems = (data, update) => {
       } else {
         if (quantity === 0) {
           data.splice(index, 1);
-          continue;
         } else {
           data[index] = item;
         }
@@ -681,9 +674,19 @@ var mergeItems = (data, update) => {
   return data;
 };
 var mergeOrderbook = (data, update) => {
+  const asks = mergeItems(data.asks, update.asks).sort(asksSortFn);
+  const bids = mergeItems(data.bids, update.bids).sort(bidsSortFn);
+  if (asks.length > 0) {
+    console.log("find first", asks[0], bids[0]);
+    const firstPrice = asks[0][0];
+    const index = bids.findIndex((item) => item[0] < firstPrice);
+    if (index > 0) {
+      bids.splice(0, index + 1);
+    }
+  }
   return {
-    asks: mergeItems(data.asks, update.asks).sort(asksSortFn),
-    bids: mergeItems(data.bids, update.bids).sort(bidsSortFn)
+    asks,
+    bids
   };
 };
 var useOrderbookStream = (symbol, initial = { asks: [], bids: [] }, options) => {
@@ -959,12 +962,10 @@ var useMarkPricesStream = () => {
         //   return "markprices";
         // },
         onError: (error) => {
-          console.log("error", error);
         }
       }
     );
     return () => {
-      console.log("unsubscribe!!!!!!!");
       unsubscribe?.();
     };
   });
@@ -1014,7 +1015,6 @@ var usePositionStream = (symbol, options) => {
     ...options,
     formatter: (data2) => data2,
     onError: (err) => {
-      console.log("usePositionStream error", err);
     }
   });
   const { data: markPrices } = useMarkPricesStream();
@@ -1386,9 +1386,9 @@ var BaseOrderCreator = class {
       if (totalNumber.lt(quote_min)) {
         errors.total = {
           type: "min",
-          message: `Quantity should be greater or equal than ${new utils.Decimal(
-            quote_min
-          ).todp(quote_dp)}`
+          message: `Quantity must be at least ${new utils.Decimal(quote_min).todp(
+            quote_dp
+          )}`
         };
       } else if (totalNumber.gt(quote_max)) {
         errors.total = {
@@ -1542,7 +1542,6 @@ var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
   };
   const calculate = React2.useCallback(
     (values, field, value) => {
-      console.log("calculate", values, field, value, markPrice);
       const fieldHandler = getCalculateHandler(field);
       const newValues = ramda.compose(
         ramda.head,
@@ -1651,12 +1650,11 @@ var useMarketsStream = () => {
         //   return "markprices";
         // },
         // onError: (error: any) => {
-        //   console.log("error", error);
+        //
         // },
       }
     );
     return () => {
-      console.log("unsubscribe!!!!!!!");
       unsubscribe?.();
     };
   });
@@ -3128,7 +3126,6 @@ var useWithdraw = () => {
   const withdraw = React2.useCallback(
     (inputs) => {
       return account5.assetsManager.withdraw(inputs).then((res) => {
-        console.log("---------- withdraw -------", res);
         return res;
       });
     },
@@ -3155,6 +3152,7 @@ var useDeposit = (options) => {
   const [allowance, setAllowance] = React2.useState("0");
   const { account: account5, state } = useAccount();
   const prevAddress = React2.useRef();
+  const getBalanceListener = 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");
@@ -3197,7 +3195,6 @@ var useDeposit = (options) => {
           return;
         setBalanceRevalidating(true);
         const balance2 = await fetchBalanceHandler(address, decimals);
-        console.log("----- refresh balance -----", balance2);
         setBalance(() => balance2);
         setBalanceRevalidating(false);
       } catch (e) {
@@ -3210,15 +3207,13 @@ var useDeposit = (options) => {
   );
   const fetchBalances = React2.useCallback(async (tokens) => {
     const tasks = [];
-    console.log("fetch balances ---->>>>", tokens);
     for (const token of tokens) {
       if (isNativeTokenChecker(token.address)) {
         continue;
       }
       tasks.push(account5.assetsManager.getBalanceByAddress(token.address));
     }
-    const balances = await Promise.all(tasks);
-    console.log("----- get balances from tokens -----", balances);
+    await Promise.all(tasks);
   }, []);
   const getAllowance = async (address, vaultAddress) => {
     const key = `${address}-${vaultAddress}`;
@@ -3243,10 +3238,6 @@ var useDeposit = (options) => {
       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(() => {
@@ -3306,6 +3297,26 @@ var useDeposit = (options) => {
     },
     [account5, fetchBalance, getAllowance]
   );
+  const loopGetBalance = async () => {
+    getBalanceListener.current && clearTimeout(getBalanceListener.current);
+    getBalanceListener.current = setTimeout(async () => {
+      const balance2 = await fetchBalanceHandler(
+        options?.address,
+        options?.decimals
+      );
+      setBalance(balance2);
+      loopGetBalance();
+    }, 3e3);
+  };
+  React2.useEffect(() => {
+    if (!options?.address) {
+      return;
+    }
+    loopGetBalance();
+    return () => {
+      getBalanceListener.current && clearTimeout(getBalanceListener.current);
+    };
+  }, [options?.address, options?.decimals]);
   return {
     dst,
     balance,
@@ -3344,7 +3355,6 @@ var useBalance = () => {
   const { data } = useSWRSubscription__default.default("balance", (_, { next }) => {
     const unsubscribe = ws.privateSubscribe("balance", {
       onMessage: (data2) => {
-        console.log(data2);
       }
     });
     return () => unsubscribe();
@@ -3384,7 +3394,6 @@ var usePrivateDataObserver = () => {
             }
             return orders;
           }).catch((error) => {
-            console.log("error", error, error.stack);
           });
         });
         ee.emit("orders:changed");
@@ -3393,7 +3402,6 @@ var usePrivateDataObserver = () => {
     return () => unsubscribe?.();
   }, [state.accountId]);
   React2.useEffect(() => {
-    console.log("subscribe: position: %s", state.accountId);
     if (!state.accountId)
       return;
     const key = ["/v1/positions", state.accountId];
@@ -3438,7 +3446,6 @@ var usePrivateDataObserver = () => {
       }
     });
     return () => {
-      console.log("unsubscribe: private subscription position");
       unsubscribe?.();
     };
   }, [state.accountId]);
@@ -3448,7 +3455,6 @@ var useExecutionReport = () => {
   const { data } = useSWRSubscription__default.default("executionreport", (_, { next }) => {
     const unsubscribe = ws.privateSubscribe("executionreport", {
       onMessage: (data2) => {
-        console.log(data2);
       }
     });
     return () => unsubscribe();
@@ -3489,7 +3495,6 @@ var useWooSwapQuery = () => {
   const [loading, { setTrue: start, setFalse: stop }] = useBoolean(false);
   const query = React2.useCallback(
     (inputs) => {
-      console.log("inputs", inputs);
       if (loading)
         return;
       start();
@@ -3497,7 +3502,7 @@ var useWooSwapQuery = () => {
         // src_network: inputs.srcNetwork,
         network: "arbitrum",
         from_token: inputs.srcToken,
-        to_token: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+        to_token: inputs.dstToken,
         //account.assetsManager.usdcAddress,
         from_amount: inputs.amount,
         //inputs.amount,
@@ -3563,10 +3568,10 @@ var useWooCrossSwapQuery = () => {
       start();
       const params = {
         // src_network: inputs.srcNetwork,
-        src_network: "base",
+        src_network: inputs.srcNetwork.toLowerCase(),
         dst_network: "arbitrum",
         src_token: inputs.srcToken,
-        dst_token: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+        dst_token: inputs.dstToken,
         //account.assetsManager.usdcAddress,
         src_amount: inputs.amount,
         //inputs.amount,
@@ -3598,7 +3603,6 @@ var useWooCrossSwapQuery = () => {
           minToAmount: BigInt(swapInfo.dst_infos.min_to_amount),
           orderlyNativeFees: 0n
         }).then((data) => {
-          console.log("res::::", data);
           return {
             ...swapInfo,
             dst_infos: {
@@ -3621,6 +3625,7 @@ var useCrossSwap = () => {
   const [layerStatus, setLayerStatus] = React2.useState(
     "WAITTING" /* INITIALIZING */
   );
+  const ee = useEventEmitter();
   const [bridgeMessage, setBridgeMessage] = React2.useState();
   const [status, setStatus] = React2.useState(
     types.WS_WalletStatusEnum.NO
@@ -3630,18 +3635,21 @@ var useCrossSwap = () => {
   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;
+  React2.useEffect(() => {
+    const handler = (data) => {
+      const { side, transStatus, trxId } = data;
       if (side === "DEPOSIT" && trxId === txHashFromBridge.current) {
         setStatus(transStatus);
       }
-    }
-  });
+    };
+    ee.on("wallet:changed", handler);
+    return () => {
+      ee.off("wallet:changed", handler);
+    };
+  }, [txHashFromBridge.current]);
   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: status2 } = messages[0];
         if (status2 === "INFLIGHT" /* INFLIGHT */) {
@@ -3716,7 +3724,6 @@ var useCrossSwap = () => {
       checkLayerStatus(result.hash);
       return ramda.pick(["from", "to", "hash", "value"], result);
     } catch (e) {
-      console.log("swap error:", e);
       stop();
       throw new Error(e.errorCode);
     }
@@ -4011,16 +4018,21 @@ var useSwap = () => {
     types.WS_WalletStatusEnum.NO
   );
   const txHash = React2.useRef();
-  useWalletSubscription({
-    onMessage: (message) => {
-      const { side, transStatus, trxId } = message;
+  const ee = useEventEmitter();
+  React2.useEffect(() => {
+    const handler = (data) => {
+      const { side, transStatus, trxId } = data;
       if (side === "DEPOSIT" && trxId === txHash.current) {
         setStatus(transStatus);
       }
-    }
-  });
+    };
+    ee.on("wallet:changed", handler);
+    return () => {
+      ee.off("wallet:changed", handler);
+    };
+  }, [txHash.current]);
   const dstValutDeposit = React2.useCallback(() => {
-    const brokerId = configStore.get("onlyTestnet") ? "woofi_dex" : "woofi_pro";
+    const brokerId = configStore.get("brokerId");
     return {
       accountId: account5.accountIdHashStr,
       brokerHash: core.utils.parseBrokerHash(brokerId),
@@ -4054,11 +4066,9 @@ var useSwap = () => {
           }
         );
         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);
         throw new Error(e.errorCode);
       }
     },