@orderly.network/hooks 2.0.1-alpha.2 → 2.0.1-alpha.4

package/dist/index.d.mts

@@ -27,7 +27,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.0.1-alpha.2";
+declare const _default: "2.0.1-alpha.4";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -1370,6 +1370,8 @@ type WalletRewardsItem = {
 type WalletRewards = {
     wallet_lifetime_trading_rewards_order: string;
     wallet_lifetime_trading_rewards_escrow: string;
+    wallet_pending_trading_rewards_order: string;
+    wallet_pending_trading_rewards_escrow: string;
     rows: WalletRewardsItem[];
 };
 type WalletRewardsHistoryReturns = [
@@ -1513,7 +1515,11 @@ type Options = Omit<OrderEntryParameters["1"], "symbolInfo">;
 type OrderEntryReturn = {
     submit: (options?: {
         resetOnSuccess?: boolean;
-    }) => Promise<void>;
+    }) => Promise<{
+        success: boolean;
+        data: Record<string, any>;
+        timestamp: number;
+    }>;
     reset: () => void;
     resetErrors: () => void;
     resetMetaState: () => void;
@@ -1613,7 +1619,7 @@ type OrderEntryReturn = {
  * await submit();
  * ```
  */
-declare const useOrderEntry: (symbol: string, options: Options) => OrderEntryReturn;
+declare const useOrderEntry: (symbol: string, options?: Options) => OrderEntryReturn;
 
 declare const useOrderEntity: (order: {
     [key: string]: any;

package/dist/index.d.ts

@@ -27,7 +27,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.0.1-alpha.2";
+declare const _default: "2.0.1-alpha.4";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -1370,6 +1370,8 @@ type WalletRewardsItem = {
 type WalletRewards = {
     wallet_lifetime_trading_rewards_order: string;
     wallet_lifetime_trading_rewards_escrow: string;
+    wallet_pending_trading_rewards_order: string;
+    wallet_pending_trading_rewards_escrow: string;
     rows: WalletRewardsItem[];
 };
 type WalletRewardsHistoryReturns = [
@@ -1513,7 +1515,11 @@ type Options = Omit<OrderEntryParameters["1"], "symbolInfo">;
 type OrderEntryReturn = {
     submit: (options?: {
         resetOnSuccess?: boolean;
-    }) => Promise<void>;
+    }) => Promise<{
+        success: boolean;
+        data: Record<string, any>;
+        timestamp: number;
+    }>;
     reset: () => void;
     resetErrors: () => void;
     resetMetaState: () => void;
@@ -1613,7 +1619,7 @@ type OrderEntryReturn = {
  * await submit();
  * ```
  */
-declare const useOrderEntry: (symbol: string, options: Options) => OrderEntryReturn;
+declare const useOrderEntry: (symbol: string, options?: Options) => OrderEntryReturn;
 
 declare const useOrderEntity: (order: {
     [key: string]: any;

package/dist/index.js

@@ -40,9 +40,9 @@ var __export = (target, all) => {
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.0.1-alpha.2";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.0.1-alpha.4";
 }
-var version_default = "2.0.1-alpha.2";
+var version_default = "2.0.1-alpha.4";
 var fetcher = (url, init = {}, queryOptions) => net.get(url, init, queryOptions?.formatter);
 var OrderlyContext = React.createContext({
   // configStore: new MemoryConfigStore(),
@@ -52,11 +52,6 @@ var OrderlyProvider = OrderlyContext.Provider;
 // src/useConfig.ts
 function useConfig(key, defaultValue) {
   const { configStore } = React.useContext(OrderlyContext);
-  if (!configStore) {
-    throw new Error(
-      "useConfig must be used within OrderlyConfigProvider or OrderlyAppProvider"
-    );
-  }
   if (typeof key !== "undefined") {
     if (typeof defaultValue !== "undefined") {
       return configStore.getOr(key, defaultValue);
@@ -3526,15 +3521,15 @@ var useMaxQty = (symbol, side, reduceOnly = false) => {
       IMR_Factor: accountInfo.imr_factor[symbol]
     });
   }, [
-    orders,
-    // positionsData,
+    symbol,
+    positions2,
+    reduceOnly,
     markPrices,
+    orders,
     accountInfo,
     symbolInfo,
-    symbol,
     side,
-    totalCollateral,
-    reduceOnly
+    totalCollateral
   ]);
   return Math.max(maxQty, 0);
 };
@@ -13126,25 +13121,25 @@ var getContractByEnv = (env) => {
     contractABI: proxyLedgerAbi_default,
     orderlyChainRpcUrl: getOrderlyChainRPC(env)
   };
-  if (env === "dev" /* dev */) {
+  if (env === "dev") {
     data.orderTokenAddress = "0xe2eB2df1CA9D90c8501049bAEEEf57f111782903";
     data.orderTokenAddressOnEthereum = "0x4cdE8A33afbb7f0F80841d9AE3Ada59fA1413F38";
     data.orderlyContract = "0x741a48F39683c345Ff37A86791537154869C77D4";
     data.contract = "0x0180107E72FB14a22a776913063b8a4081E9dc94";
   }
-  if (env === "qa" /* qa */) {
+  if (env === "qa") {
     data.orderTokenAddress = "0x562874e9fcb02Ae6164781EcFb4AeAa169E99B18";
     data.orderTokenAddressOnEthereum = "0x8F7c2c827f0E9248CB5cf81fE732FDa62207F09c";
-    data.orderlyContract = "0xf4EFdE916687eFBa271b1eDf436B206b285bc478";
+    data.orderlyContract = "0x871106E5c5f33F6B743990a0b465B61D6cd64714";
     data.contract = "0xB20A18d8A53Ea23A5E8da32465De374f942693D7";
   }
-  if (env === "staging" /* staging */) {
+  if (env === "staging") {
     data.orderTokenAddress = "0x5f11B4510BC50EfB82Fb55D7839a46e9b621f8C2";
     data.orderTokenAddressOnEthereum = "0x48465104e96AEE47bdD0E40dD40b1DFE1a66e232";
     data.orderlyContract = "0xAFEabBA48Aa0D33267a4ADf92a63C3E1A1284AB5";
     data.contract = "0x912196EB2583A2f0a18FaD632ee5dB65B8C93EEf";
   }
-  if (env === "prod" /* prod */) {
+  if (env === "prod") {
     data.orderTokenAddress = "0x4E200fE2f3eFb977d5fd9c430A41531FB04d97B8";
     data.orderTokenAddressOnEthereum = "0xABD4C63d2616A5201454168269031355f4764337";
     data.orderlyContract = "0x7819704B69a38fD63Cc768134b8410dc08B987D0";
@@ -13212,8 +13207,10 @@ var useWalletRewardsHistory = (type) => {
   } = useQuery(address !== void 0 ? path2 : "", {
     formatter: (res) => {
       return {
-        wallet_lifetime_trading_rewards_order: res?.group_lifetime_mm_rewards_order || res?.wallet_lifetime_trading_rewards_order || 0,
-        wallet_lifetime_trading_rewards_escrow: res?.group_lifetime_mm_rewards_escrow || res?.wallet_lifetime_trading_rewards_escrow || 0,
+        wallet_lifetime_trading_rewards_order: res?.wallet_lifetime_trading_rewards_order ?? 0,
+        wallet_lifetime_trading_rewards_escrow: res?.wallet_lifetime_trading_rewards_escrow ?? 0,
+        wallet_pending_trading_rewards_order: res.wallet_pending_trading_rewards_order ?? 0,
+        wallet_pending_trading_rewards_escrow: res.wallet_pending_trading_rewards_escrow ?? 0,
         rows: (res?.rows || []).map((item) => ({
           ...item,
           r_wallet: item?.total_reward || item?.r_wallet
@@ -13301,94 +13298,6 @@ function getQueryParamsFromObject(obj) {
   }
   return queryParams.toString();
 }
-var initialOrderState = {
-  order_price: "",
-  order_quantity: "",
-  trigger_price: "",
-  tp_trigger_price: "",
-  sl_trigger_price: "",
-  total: "",
-  symbol: ""
-};
-var useOrderStore = zustand.create()(
-  immer.immer((set, get3) => ({
-    entry: {
-      side: types.OrderSide.BUY,
-      order_type: types.OrderType.LIMIT,
-      ...initialOrderState
-    },
-    estLeverage: null,
-    estLiquidationPrice: null,
-    errors: {},
-    actions: {
-      hasTP_SL: () => {
-        const order = get3().entry;
-        return typeof order.tp_trigger_price !== "undefined" || typeof order.sl_trigger_price !== "undefined";
-      },
-      updateOrderComputed: (data) => {
-        set(
-          (state) => {
-            state.estLeverage = data.estLeverage;
-            state.estLiquidationPrice = data.estLiquidationPrice;
-          },
-          false
-          // "updateOrderComputed"
-        );
-      },
-      updateOrder: (order) => {
-        set(
-          (state) => {
-            state.entry = {
-              ...state.entry,
-              ...order
-            };
-          },
-          false
-          // "updateOrder"
-        );
-      },
-      updateOrderByKey: (key, value) => {
-        set(
-          (state) => {
-            state.entry[key] = value;
-          },
-          false
-          // "updateOrderByKey"
-        );
-      },
-      restoreOrder: (order) => {
-        set(
-          (state) => {
-            state.entry = order;
-          },
-          false
-          // "restoreOrder"
-        );
-      },
-      resetOrder: (order) => {
-        set(
-          (state) => {
-            state.entry.order_price = "";
-            state.entry.order_quantity = "";
-            state.entry.trigger_price = "";
-            state.entry.total = "";
-            state.entry.tp_trigger_price = "";
-            state.entry.tp_pnl = "";
-            state.entry.tp_offset = "";
-            state.entry.tp_offset_percentage = "";
-            state.entry.sl_trigger_price = "";
-            state.entry.sl_pnl = "";
-            state.entry.sl_offset = "";
-            state.entry.sl_offset_percentage = "";
-          },
-          true
-          // "resetOrder"
-        );
-      }
-    }
-  }))
-);
-var useOrderEntryFromStore = () => useOrderStore((state) => state.entry);
 var getCreateOrderUrl = (order) => {
   const isAlgoOrder = order?.order_type === types.OrderType.STOP_LIMIT || order?.order_type === types.OrderType.STOP_MARKET || order?.order_type === types.OrderType.CLOSE_POSITION || order.algo_type && order.algo_type === types.AlgoOrderRootType.BRACKET || isBracketOrder(order);
   return isAlgoOrder ? "/v1/algo/order" : "/v1/order";
@@ -13514,20 +13423,88 @@ var calcEstLeverage = (order, askAndBid, inputs) => {
     }
   });
 };
+var initialOrderState = {
+  order_price: "",
+  order_quantity: "",
+  trigger_price: "",
+  tp_trigger_price: "",
+  sl_trigger_price: "",
+  tp_pnl: "",
+  sl_pnl: "",
+  tp_offset_percentage: "",
+  sl_offset_percentage: "",
+  tp_offset: "",
+  sl_offset: "",
+  total: ""
+  // symbol: "",
+};
+var useOrderStore = (initialOrder) => {
+  const [entry, setEntry] = React.useState(initialOrder);
+  const [estLeverage, setEstLeverage] = React.useState(null);
+  const [estLiquidationPrice, setEstLiquidationPrice] = React.useState(
+    null
+  );
+  const [errors, setErrors] = React.useState({});
+  const updateOrder = (order) => {
+    setEntry(
+      immer$1.produce((draft) => {
+        return { ...draft, ...order };
+      })
+      // (prev) => ({ ...prev, ...order })
+    );
+  };
+  const updateOrderByKey = (key, value) => {
+    setEntry(
+      immer$1.produce((draft) => {
+        draft[key] = value;
+      })
+    );
+  };
+  const restoreOrder = (order) => {
+    setEntry(immer$1.produce((draft) => order));
+  };
+  const updateOrderComputed = (data) => {
+    setEstLeverage(data.estLeverage);
+    setEstLiquidationPrice(data.estLiquidationPrice);
+  };
+  const resetOrder = (order) => {
+    setEntry(
+      immer$1.produce((draft) => ({
+        ...draft,
+        ...order ?? initialOrderState
+      }))
+    );
+  };
+  const hasTP_SL = () => {
+    return typeof entry.tp_trigger_price !== "undefined" || typeof entry.sl_trigger_price !== "undefined";
+  };
+  return {
+    entry,
+    estLeverage,
+    estLiquidationPrice,
+    errors,
+    actions: {
+      updateOrder,
+      updateOrderByKey,
+      restoreOrder,
+      updateOrderComputed,
+      resetOrder,
+      hasTP_SL
+    }
+  };
+};
 
 // src/next/useOrderEntry/useOrderEntry.internal.ts
 var useOrderEntryNextInternal = (symbol, options = {}) => {
-  const orderEntity = useOrderEntryFromStore();
-  const {
-    // markPrice,
-    initialOrder = {
-      side: types.OrderSide.BUY,
-      order_type: types.OrderType.LIMIT,
-      order_price: ""
-    },
-    symbolInfo
-  } = options;
-  const orderEntryActions = useOrderStore((state) => state.actions);
+  const { symbolInfo } = options;
+  const initialOrder = {
+    side: types.OrderSide.BUY,
+    order_type: types.OrderType.LIMIT,
+    order_price: "",
+    symbol,
+    ...options.initialOrder
+  };
+  const { actions: orderEntryActions, entry: orderEntity } = useOrderStore(initialOrder);
   const calculate = React.useCallback(
     (values2, fieldName, value, markPrice, config) => {
       const fieldHandler = getCalculateHandler(fieldName);
@@ -13541,22 +13518,22 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
     },
     []
   );
-  React.useEffect(() => {
-    if (initialOrder) {
-      orderEntryActions.restoreOrder(initialOrder);
-    }
-  }, []);
   React.useEffect(() => {
     orderEntryActions.updateOrderByKey("symbol", symbol);
-  }, [symbol]);
+  }, [orderEntryActions, symbol]);
   const setValue = (key, value, additional) => {
     if (!symbolInfo) {
       orderEntryActions.updateOrderByKey(key, value);
       return;
     }
-    const values2 = useOrderStore.getState().entry;
     const { markPrice } = additional ?? { markPrice: 0 };
-    let newValues = calculate({ ...values2 }, key, value, markPrice, symbolInfo);
+    let newValues = calculate(
+      { ...orderEntity },
+      key,
+      value,
+      markPrice,
+      symbolInfo
+    );
     if (key === "order_type") {
       if (value === types.OrderType.MARKET || value === types.OrderType.STOP_MARKET) {
         newValues = calculate(
@@ -13632,37 +13609,32 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
     }
     return newValues;
   };
-  const setValues = React.useCallback(
-    (values2, additional) => {
-      if (!symbolInfo) {
-        orderEntryActions.updateOrder(values2);
-        return;
-      }
-      const prevValues = useOrderStore.getState().entry;
-      let newValues = { ...prevValues };
-      Object.keys(values2).forEach((key) => {
-        newValues = calculate(
-          newValues,
-          key,
-          values2[key],
-          additional?.markPrice ?? 0,
-          symbolInfo
-        );
-      });
-      orderEntryActions.updateOrder(newValues);
-      return newValues;
-    },
-    [calculate, orderEntryActions, symbolInfo]
-  );
+  const setValues = (values2, additional) => {
+    if (!symbolInfo) {
+      orderEntryActions.updateOrder(values2);
+      return;
+    }
+    let newValues = { ...orderEntity };
+    Object.keys(values2).forEach((key) => {
+      newValues = calculate(
+        newValues,
+        key,
+        values2[key],
+        additional?.markPrice ?? 0,
+        symbolInfo
+      );
+    });
+    orderEntryActions.updateOrder(newValues);
+    return newValues;
+  };
   const onMarkPriceUpdated = React.useCallback(
     (markPrice, baseOn) => {
       if (!options.symbolInfo)
         return;
-      const values2 = useOrderStore.getState().entry;
       let newValues;
       if (typeof baseOn === "undefined") {
         newValues = calculate(
-          { ...values2 },
+          { ...orderEntity },
           "order_price",
           markPrice,
           markPrice,
@@ -13670,9 +13642,9 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
         );
       } else {
         newValues = calculate(
-          { ...values2 },
+          { ...orderEntity },
           baseOn,
-          values2[baseOn],
+          orderEntity[baseOn],
           markPrice,
           options.symbolInfo
         );
@@ -13695,7 +13667,7 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
       }
       orderEntryActions.updateOrder(newValues);
     },
-    [options.symbolInfo]
+    [calculate, options.symbolInfo, orderEntity, orderEntryActions]
   );
   const validate = (order, creator, options2) => {
     const { markPrice, maxQty } = options2;
@@ -13728,12 +13700,11 @@ var useOrderEntryNextInternal = (symbol, options = {}) => {
     onMarkPriceChange: onMarkPriceUpdated
   };
 };
-var useOrderEntry2 = (symbol, options) => {
+var useOrderEntry2 = (symbol, options = {}) => {
   if (!symbol) {
-    throw new Error("symbol is required and must be a string");
+    throw new types.SDKError("symbol is required and must be a string");
   }
   const ee = useEventEmitter();
-  const fieldDirty = React.useRef({});
   const [meta, setMeta] = React.useState({
     dirty: {},
     submitted: false,
@@ -13810,18 +13781,24 @@ var useOrderEntry2 = (symbol, options) => {
       }
     });
   };
-  const canSetTPSLPrice = (key, orderType) => {
-    if (tpslFields.includes(key) && orderType !== types.OrderType.LIMIT && orderType !== types.OrderType.MARKET) {
+  const canSetTPSLPrice = (key, value, orderType) => {
+    if (tpslFields.includes(key) && value !== "" && value !== void 0 && value !== null && orderType !== types.OrderType.LIMIT && orderType !== types.OrderType.MARKET) {
       return false;
     }
     return true;
   };
   const setValue = (key, value, options2) => {
-    const { shouldUpdateLastChangedField = true } = options2 || {};
-    if (!canSetTPSLPrice(key, formattedOrder.order_type)) {
+    const { shouldUpdateLastChangedField = true, shouldUpdateDirty = true } = options2 || {};
+    if (!canSetTPSLPrice(key, value, formattedOrder.order_type)) {
       return;
     }
-    fieldDirty.current[key] = true;
+    if (shouldUpdateDirty) {
+      setMeta(
+        immer$1.produce((draft) => {
+          draft.dirty[key] = true;
+        })
+      );
+    }
     const values2 = setValueInternal(key, value, prepareData());
     if (values2) {
       interactiveValidate(values2);
@@ -13832,7 +13809,11 @@ var useOrderEntry2 = (symbol, options) => {
   };
   const setValues = (values2) => {
     if (!Object.keys(values2).every(
-      (key) => canSetTPSLPrice(key, formattedOrder.order_type)
+      (key) => canSetTPSLPrice(
+        key,
+        values2[key],
+        formattedOrder.order_type
+      )
     )) {
       return;
     }
@@ -13961,6 +13942,93 @@ var useOrderEntry2 = (symbol, options) => {
     markPrice
   };
 };
+var initialOrderState2 = {
+  order_price: "",
+  order_quantity: "",
+  trigger_price: "",
+  tp_trigger_price: "",
+  sl_trigger_price: "",
+  total: "",
+  symbol: ""
+};
+var useOrderStore2 = zustand.create()(
+  immer.immer((set, get3) => ({
+    entry: {
+      side: types.OrderSide.BUY,
+      order_type: types.OrderType.LIMIT,
+      ...initialOrderState2
+    },
+    estLeverage: null,
+    estLiquidationPrice: null,
+    errors: {},
+    actions: {
+      hasTP_SL: () => {
+        const order = get3().entry;
+        return typeof order.tp_trigger_price !== "undefined" || typeof order.sl_trigger_price !== "undefined";
+      },
+      updateOrderComputed: (data) => {
+        set(
+          (state) => {
+            state.estLeverage = data.estLeverage;
+            state.estLiquidationPrice = data.estLiquidationPrice;
+          },
+          false
+          // "updateOrderComputed"
+        );
+      },
+      updateOrder: (order) => {
+        set(
+          (state) => {
+            state.entry = {
+              ...state.entry,
+              ...order
+            };
+          },
+          false
+          // "updateOrder"
+        );
+      },
+      updateOrderByKey: (key, value) => {
+        set(
+          (state) => {
+            state.entry[key] = value;
+          },
+          false
+          // "updateOrderByKey"
+        );
+      },
+      restoreOrder: (order) => {
+        set(
+          (state) => {
+            state.entry = order;
+          },
+          false
+          // "restoreOrder"
+        );
+      },
+      resetOrder: (order) => {
+        set(
+          (state) => {
+            state.entry.order_price = "";
+            state.entry.order_quantity = "";
+            state.entry.trigger_price = "";
+            state.entry.total = "";
+            state.entry.tp_trigger_price = "";
+            state.entry.tp_pnl = "";
+            state.entry.tp_offset = "";
+            state.entry.tp_offset_percentage = "";
+            state.entry.sl_trigger_price = "";
+            state.entry.sl_pnl = "";
+            state.entry.sl_offset = "";
+            state.entry.sl_offset_percentage = "";
+          },
+          true
+          // "resetOrder"
+        );
+      }
+    }
+  }))
+);
 var useOrderEntity = (order, options) => {
   if (!order.symbol) {
     throw new types.SDKError("symbol is required");
@@ -14106,7 +14174,7 @@ exports.useMutation = useMutation;
 exports.useOrderEntity = useOrderEntity;
 exports.useOrderEntry = useOrderEntry2;
 exports.useOrderEntry_deprecated = useOrderEntry;
-exports.useOrderStore = useOrderStore;
+exports.useOrderStore = useOrderStore2;
 exports.useOrderStream = useOrderStream;
 exports.useOrderbookStream = useOrderbookStream;
 exports.usePositionActions = usePositionActions;