@pear-protocol/symmio-client 0.2.5 → 0.2.6

package/dist/react/index.mjs

@@ -22,13 +22,13 @@ var symmKeys = {
   accountsLength: (address, chainId) => ["symm", "accountsLength", address, chainId],
   accountsWithPositions: (address, chainId) => ["symm", "accountsWithPositions", address, chainId],
   accountSummary: (address, chainId) => ["symm", "accountSummary", address, chainId],
-  accountData: (address, chainId) => ["symm", "accountData", address, chainId],
+  accountData: (address, chainId, upnl) => ["symm", "accountData", address, chainId, upnl],
   signature: (address, chainId) => ["symm", "signature", address, chainId],
-  approval: (owner, spender, chainId) => ["symm", "approval", owner, spender, chainId],
+  approval: (owner, spender, chainId, token) => ["symm", "approval", owner, spender, chainId, token],
   balances: (address, chainId) => ["symm", "balances", address, chainId],
-  positions: (address, chainId) => ["symm", "positions", address, chainId],
-  openOrders: (address, chainId) => ["symm", "openOrders", address, chainId],
-  tradeHistory: (address, chainId) => ["symm", "tradeHistory", address, chainId],
+  positions: (params) => ["symm", "positions", params],
+  openOrders: (params) => ["symm", "openOrders", params],
+  tradeHistory: (params) => ["symm", "tradeHistory", params],
   tpslOrders: (address, chainId) => ["symm", "tpslOrders", address, chainId],
   tpslOrdersList: (params) => ["symm", "tpslOrders", params],
   twapOrders: (address, chainId) => ["symm", "twapOrders", address, chainId],
@@ -42,7 +42,7 @@ var symmKeys = {
   fundingRates: (chainId) => ["symm", "fundingRates", chainId],
   fundingPayments: (params) => ["symm", "fundingPayments", params],
   fundingHistory: (params) => ["symm", "fundingHistory", params],
-  portfolio: (address, chainId) => ["symm", "portfolio", address, chainId],
+  portfolio: (params) => ["symm", "portfolio", params],
   notifications: (address, chainId) => ["symm", "notifications", address, chainId],
   unreadCount: (address, chainId) => ["symm", "unreadCount", address, chainId],
   availableMargin: (address, chainId) => ["symm", "availableMargin", address, chainId],
@@ -58,10 +58,8 @@ function asUnsubscribeFn(value) {
   return typeof value === "function" ? value : null;
 }
 function useSymmWs(params) {
-  const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
   const queryClient = useQueryClient();
-  const { accountAddress } = params;
-  const chainId = params.chainId ?? ctxChainId;
+  const { symmCoreClient, accountAddress, chainId } = params;
   const [isConnected, setIsConnected] = useState(false);
   useEffect(() => {
     if (!symmCoreClient || !accountAddress) {
@@ -76,19 +74,19 @@ function useSymmWs(params) {
     unsubscribers.push(removeOnConnect, removeOnDisconnect);
     const positionsUnsub = asUnsubscribeFn(ws.subscribeToPositions(addr, chainId, () => {
       queryClient.invalidateQueries({
-        queryKey: symmKeys.positions(accountAddress, chainId)
+        queryKey: ["symm", "positions"]
       });
     }));
     if (positionsUnsub) unsubscribers.push(positionsUnsub);
     const openOrdersUnsub = asUnsubscribeFn(ws.subscribeToOpenOrders(addr, chainId, () => {
       queryClient.invalidateQueries({
-        queryKey: symmKeys.openOrders(accountAddress, chainId)
+        queryKey: ["symm", "openOrders"]
       });
     }));
     if (openOrdersUnsub) unsubscribers.push(openOrdersUnsub);
     const tradesUnsub = asUnsubscribeFn(ws.subscribeToTrades(addr, chainId, () => {
       queryClient.invalidateQueries({
-        queryKey: symmKeys.tradeHistory(accountAddress, chainId)
+        queryKey: ["symm", "tradeHistory"]
       });
     }));
     if (tradesUnsub) unsubscribers.push(tradesUnsub);
@@ -127,10 +125,10 @@ function useSymmWs(params) {
     if (triggerOrdersUnsub) unsubscribers.push(triggerOrdersUnsub);
     const executionsUnsub = asUnsubscribeFn(ws.subscribeToExecutions(addr, chainId, () => {
       queryClient.invalidateQueries({
-        queryKey: symmKeys.positions(accountAddress, chainId)
+        queryKey: ["symm", "positions"]
       });
       queryClient.invalidateQueries({
-        queryKey: symmKeys.portfolio(accountAddress, chainId)
+        queryKey: ["symm", "portfolio"]
       });
     }));
     if (executionsUnsub) unsubscribers.push(executionsUnsub);
@@ -165,7 +163,7 @@ function SymmProvider({
     });
   }, [chainId, symmCoreConfig.apiUrl, symmCoreConfig.wsUrl]);
   const resolvedAuthToken = authToken ?? accessToken;
-  useSymmWs({ chainId });
+  useSymmWs({ symmCoreClient, accountAddress: address, chainId });
   const value = useMemo(
     () => ({
       symmCoreClient,
@@ -1396,7 +1394,7 @@ function useSymmApproval(params) {
   const internalEnabled = !!publicClient && !!owner && !!resolvedSpender && !!resolvedToken;
   const approvalQuery = useQuery({
     ...params.query,
-    queryKey: symmKeys.approval(owner, resolvedSpender, chainId),
+    queryKey: symmKeys.approval(owner, resolvedSpender, chainId, resolvedToken),
     queryFn: async () => {
       const [allowanceVal, balanceVal] = await Promise.all([
         getAllowance(publicClient, resolvedToken, owner, resolvedSpender),
@@ -1414,7 +1412,7 @@ function useSymmApproval(params) {
     },
     onSuccess: () => {
       queryClient.invalidateQueries({
-        queryKey: symmKeys.approval(owner, resolvedSpender, chainId)
+        queryKey: symmKeys.approval(owner, resolvedSpender, chainId, resolvedToken)
       });
     }
   });
@@ -24549,7 +24547,7 @@ function useSymmAccountData(params) {
   const internalEnabled = !!symmCoreClient && !!address;
   const query = useQuery({
     ...params.query,
-    queryKey: symmKeys.accountData(address, chainId),
+    queryKey: symmKeys.accountData(address, chainId, upnl),
     queryFn: () => symmCoreClient.accounts.getData({
       address,
       chainId,
@@ -24639,13 +24637,17 @@ function useSymmTrade() {
 }
 function useSymmPositions(params) {
   const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
-  const { accountAddress, mainAddress, address } = params;
-  const resolvedAddress = address ?? mainAddress;
+  const { accountAddress, address } = params;
+  const resolvedAddress = accountAddress ? void 0 : address;
   const chainId = params.chainId ?? ctxChainId;
   const internalEnabled = !!symmCoreClient && !!(accountAddress || resolvedAddress);
   const query = useQuery({
     ...params.query,
-    queryKey: symmKeys.positions(accountAddress ?? resolvedAddress, chainId),
+    queryKey: symmKeys.positions({
+      accountAddress,
+      address: resolvedAddress,
+      chainId
+    }),
     queryFn: () => symmCoreClient.positions.getOpen({
       accountAddress,
       address: resolvedAddress,
@@ -24661,15 +24663,19 @@ function useSymmPositions(params) {
 }
 function useSymmOpenOrders(params) {
   const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
-  const { accountAddress, mainAddress } = params;
+  const { accountAddress, address } = params;
+  const resolvedAddress = accountAddress ? void 0 : address;
   const chainId = params.chainId ?? ctxChainId;
-  const internalEnabled = !!symmCoreClient && !!(accountAddress || mainAddress);
+  const internalEnabled = !!symmCoreClient && !!(accountAddress || resolvedAddress);
   const query = useQuery({
     ...params.query,
-    queryKey: symmKeys.openOrders(accountAddress ?? mainAddress, chainId),
+    queryKey: symmKeys.openOrders({
+      accountAddress,
+      address: resolvedAddress,
+      chainId
+    }),
     queryFn: () => symmCoreClient.orders.list({
-      address: accountAddress,
-      mainAddress,
+      address: accountAddress ?? resolvedAddress,
       chainId
     }),
     enabled: internalEnabled && (params.query?.enabled ?? true)
@@ -24682,17 +24688,25 @@ function useSymmOpenOrders(params) {
 }
 function useSymmTradeHistory(params) {
   const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
-  const { accountAddress, mainAddress } = params;
+  const { accountAddress, address } = params;
+  const resolvedAddress = accountAddress ? void 0 : address;
   const chainId = params.chainId ?? ctxChainId;
-  const internalEnabled = !!symmCoreClient && !!(accountAddress || mainAddress);
+  const internalEnabled = !!symmCoreClient && !!(accountAddress || resolvedAddress);
   const query = useQuery({
     ...params.query,
-    queryKey: symmKeys.tradeHistory(accountAddress ?? mainAddress, chainId),
-    queryFn: () => symmCoreClient.positions.getTradeHistory({
+    queryKey: symmKeys.tradeHistory({
       accountAddress,
-      mainAddress,
+      address: resolvedAddress,
       chainId
     }),
+    queryFn: () => {
+      const request = {
+        accountAddress,
+        address: resolvedAddress,
+        chainId
+      };
+      return symmCoreClient.positions.getTradeHistory(request);
+    },
     enabled: internalEnabled && (params.query?.enabled ?? true)
   });
   return {
@@ -24728,12 +24742,12 @@ function useSymmTpsl() {
 }
 function useSymmTpslOrders(params) {
   const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
-  const { accountAddress, mainAddress, positionId, type, status } = params;
+  const { accountAddress, address, positionId, type, status } = params;
+  const resolvedAddress = accountAddress ? void 0 : address;
   const chainId = params.chainId ?? ctxChainId;
-  const internalEnabled = !!symmCoreClient && !!(accountAddress || mainAddress || positionId);
+  const internalEnabled = !!symmCoreClient && !!(accountAddress || resolvedAddress || positionId);
   const request = {
-    address: accountAddress,
-    mainAddress,
+    address: accountAddress ?? resolvedAddress,
     positionId,
     type,
     status,
@@ -24743,7 +24757,7 @@ function useSymmTpslOrders(params) {
     ...params.query,
     queryKey: symmKeys.tpslOrdersList({
       accountAddress,
-      mainAddress,
+      address: resolvedAddress,
       positionId,
       type,
       status,
@@ -24762,15 +24776,15 @@ function useSymmTpslOrders(params) {
 function useSymmTwap(params) {
   const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
   const queryClient = useQueryClient();
-  const { accountAddress, mainAddress } = params;
+  const { accountAddress, address } = params;
+  const resolvedAddress = accountAddress ? void 0 : address;
   const chainId = params.chainId ?? ctxChainId;
-  const internalEnabled = !!symmCoreClient && !!(accountAddress || mainAddress);
+  const internalEnabled = !!symmCoreClient && !!(accountAddress || resolvedAddress);
   const query = useQuery({
     ...params.query,
-    queryKey: symmKeys.twapOrders(accountAddress ?? mainAddress, chainId),
+    queryKey: symmKeys.twapOrders(accountAddress ?? resolvedAddress, chainId),
     queryFn: () => symmCoreClient.orders.getTwapOrders({
-      address: accountAddress,
-      mainAddress,
+      address: accountAddress ?? resolvedAddress,
       chainId
     }),
     enabled: internalEnabled && (params.query?.enabled ?? true)
@@ -24839,12 +24853,12 @@ function useSymmTriggerConfig(params) {
 }
 function useSymmTriggerOrders(params) {
   const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
-  const { accountAddress, mainAddress, status, limit, offset } = params;
+  const { accountAddress, address, status, limit, offset } = params;
+  const resolvedAddress = accountAddress ? void 0 : address;
   const chainId = params.chainId ?? ctxChainId;
-  const internalEnabled = !!symmCoreClient && !!(accountAddress || mainAddress);
+  const internalEnabled = !!symmCoreClient && !!(accountAddress || resolvedAddress);
   const request = {
-    address: accountAddress,
-    mainAddress,
+    address: accountAddress ?? resolvedAddress,
     chainId,
     status,
     limit,
@@ -24854,7 +24868,7 @@ function useSymmTriggerOrders(params) {
     ...params.query,
     queryKey: symmKeys.triggerOrders({
       accountAddress,
-      mainAddress,
+      address: resolvedAddress,
       chainId,
       status,
       limit,
@@ -25071,17 +25085,25 @@ function useSymmFundingPayments(params) {
 }
 function useSymmPortfolio(params) {
   const { symmCoreClient, chainId: ctxChainId } = useSymmContext();
-  const { accountAddress, mainAddress } = params;
+  const { accountAddress, address } = params;
+  const resolvedAddress = accountAddress ? void 0 : address;
   const chainId = params.chainId ?? ctxChainId;
-  const internalEnabled = !!symmCoreClient && !!(accountAddress || mainAddress);
+  const internalEnabled = !!symmCoreClient && !!(accountAddress || resolvedAddress);
   const query = useQuery({
     ...params.query,
-    queryKey: symmKeys.portfolio(accountAddress ?? mainAddress, chainId),
-    queryFn: () => symmCoreClient.portfolio.getMetrics({
+    queryKey: symmKeys.portfolio({
       accountAddress,
-      mainAddress,
+      address: resolvedAddress,
       chainId
     }),
+    queryFn: () => {
+      const request = {
+        accountAddress,
+        address: resolvedAddress,
+        chainId
+      };
+      return symmCoreClient.portfolio.getMetrics(request);
+    },
     enabled: internalEnabled && (params.query?.enabled ?? true)
   });
   return {