@shogun-sdk/swap 0.0.2-test.36 → 0.0.2-test.38

package/dist/core.cjs

@@ -974,18 +974,42 @@ async function getOrders({
   evmAddress,
   solAddress
 }) {
-  if (!evmAddress && !solAddress) {
+  const wallets = [evmAddress, solAddress].filter(
+    (wallet) => Boolean(wallet)
+  );
+  if (wallets.length === 0) {
     throw new Error("At least one wallet address (EVM, Solana) must be provided.");
   }
-  const orders = await (0, import_intents_sdk13.fetchUserOrders)(evmAddress, solAddress);
-  return orders;
+  const results = await Promise.all(
+    wallets.map((wallet) => (0, import_intents_sdk13.fetchUserOrders)({ wallet }))
+  );
+  return results.reduce(
+    (merged, orders) => {
+      merged.singleChainLimitOrders.push(...orders.singleChainLimitOrders);
+      merged.crossChainLimitOrders.push(...orders.crossChainLimitOrders);
+      return merged;
+    },
+    { singleChainLimitOrders: [], crossChainLimitOrders: [] }
+  );
 }
 
 // src/core/orders/cancelOrder.ts
 var import_intents_sdk14 = require("@shogun-sdk/intents-sdk");
 var import_web32 = require("@solana/web3.js");
 var import_viem8 = require("viem");
-async function cancelIntentsOrder({
+var inFlightCancels = /* @__PURE__ */ new Map();
+function cancelIntentsOrder(args) {
+  const srcChain = "srcChainId" in args.order ? args.order.srcChainId : args.order.chainId;
+  const key = `${srcChain}:${args.order.orderId}`;
+  const existing = inFlightCancels.get(key);
+  if (existing) return existing;
+  const pending = performCancel(args).finally(() => {
+    inFlightCancels.delete(key);
+  });
+  inFlightCancels.set(key, pending);
+  return pending;
+}
+async function performCancel({
   order,
   wallet,
   sol_rpc

package/dist/core.js

@@ -954,11 +954,23 @@ async function getOrders({
   evmAddress,
   solAddress
 }) {
-  if (!evmAddress && !solAddress) {
+  const wallets = [evmAddress, solAddress].filter(
+    (wallet) => Boolean(wallet)
+  );
+  if (wallets.length === 0) {
     throw new Error("At least one wallet address (EVM, Solana) must be provided.");
   }
-  const orders = await fetchUserOrders(evmAddress, solAddress);
-  return orders;
+  const results = await Promise.all(
+    wallets.map((wallet) => fetchUserOrders({ wallet }))
+  );
+  return results.reduce(
+    (merged, orders) => {
+      merged.singleChainLimitOrders.push(...orders.singleChainLimitOrders);
+      merged.crossChainLimitOrders.push(...orders.crossChainLimitOrders);
+      return merged;
+    },
+    { singleChainLimitOrders: [], crossChainLimitOrders: [] }
+  );
 }
 
 // src/core/orders/cancelOrder.ts
@@ -975,7 +987,19 @@ import {
   VersionedTransaction as VersionedTransaction2
 } from "@solana/web3.js";
 import { encodeFunctionData as encodeFunctionData3 } from "viem";
-async function cancelIntentsOrder({
+var inFlightCancels = /* @__PURE__ */ new Map();
+function cancelIntentsOrder(args) {
+  const srcChain = "srcChainId" in args.order ? args.order.srcChainId : args.order.chainId;
+  const key = `${srcChain}:${args.order.orderId}`;
+  const existing = inFlightCancels.get(key);
+  if (existing) return existing;
+  const pending = performCancel(args).finally(() => {
+    inFlightCancels.delete(key);
+  });
+  inFlightCancels.set(key, pending);
+  return pending;
+}
+async function performCancel({
   order,
   wallet,
   sol_rpc

package/dist/index.cjs

@@ -974,18 +974,42 @@ async function getOrders({
   evmAddress,
   solAddress
 }) {
-  if (!evmAddress && !solAddress) {
+  const wallets = [evmAddress, solAddress].filter(
+    (wallet) => Boolean(wallet)
+  );
+  if (wallets.length === 0) {
     throw new Error("At least one wallet address (EVM, Solana) must be provided.");
   }
-  const orders = await (0, import_intents_sdk13.fetchUserOrders)(evmAddress, solAddress);
-  return orders;
+  const results = await Promise.all(
+    wallets.map((wallet) => (0, import_intents_sdk13.fetchUserOrders)({ wallet }))
+  );
+  return results.reduce(
+    (merged, orders) => {
+      merged.singleChainLimitOrders.push(...orders.singleChainLimitOrders);
+      merged.crossChainLimitOrders.push(...orders.crossChainLimitOrders);
+      return merged;
+    },
+    { singleChainLimitOrders: [], crossChainLimitOrders: [] }
+  );
 }
 
 // src/core/orders/cancelOrder.ts
 var import_intents_sdk14 = require("@shogun-sdk/intents-sdk");
 var import_web32 = require("@solana/web3.js");
 var import_viem8 = require("viem");
-async function cancelIntentsOrder({
+var inFlightCancels = /* @__PURE__ */ new Map();
+function cancelIntentsOrder(args) {
+  const srcChain = "srcChainId" in args.order ? args.order.srcChainId : args.order.chainId;
+  const key = `${srcChain}:${args.order.orderId}`;
+  const existing = inFlightCancels.get(key);
+  if (existing) return existing;
+  const pending = performCancel(args).finally(() => {
+    inFlightCancels.delete(key);
+  });
+  inFlightCancels.set(key, pending);
+  return pending;
+}
+async function performCancel({
   order,
   wallet,
   sol_rpc

package/dist/index.js

@@ -954,11 +954,23 @@ async function getOrders({
   evmAddress,
   solAddress
 }) {
-  if (!evmAddress && !solAddress) {
+  const wallets = [evmAddress, solAddress].filter(
+    (wallet) => Boolean(wallet)
+  );
+  if (wallets.length === 0) {
     throw new Error("At least one wallet address (EVM, Solana) must be provided.");
   }
-  const orders = await fetchUserOrders(evmAddress, solAddress);
-  return orders;
+  const results = await Promise.all(
+    wallets.map((wallet) => fetchUserOrders({ wallet }))
+  );
+  return results.reduce(
+    (merged, orders) => {
+      merged.singleChainLimitOrders.push(...orders.singleChainLimitOrders);
+      merged.crossChainLimitOrders.push(...orders.crossChainLimitOrders);
+      return merged;
+    },
+    { singleChainLimitOrders: [], crossChainLimitOrders: [] }
+  );
 }
 
 // src/core/orders/cancelOrder.ts
@@ -975,7 +987,19 @@ import {
   VersionedTransaction as VersionedTransaction2
 } from "@solana/web3.js";
 import { encodeFunctionData as encodeFunctionData3 } from "viem";
-async function cancelIntentsOrder({
+var inFlightCancels = /* @__PURE__ */ new Map();
+function cancelIntentsOrder(args) {
+  const srcChain = "srcChainId" in args.order ? args.order.srcChainId : args.order.chainId;
+  const key = `${srcChain}:${args.order.orderId}`;
+  const existing = inFlightCancels.get(key);
+  if (existing) return existing;
+  const pending = performCancel(args).finally(() => {
+    inFlightCancels.delete(key);
+  });
+  inFlightCancels.set(key, pending);
+  return pending;
+}
+async function performCancel({
   order,
   wallet,
   sol_rpc

package/dist/react.cjs

@@ -995,18 +995,42 @@ async function getOrders({
   evmAddress,
   solAddress
 }) {
-  if (!evmAddress && !solAddress) {
+  const wallets = [evmAddress, solAddress].filter(
+    (wallet) => Boolean(wallet)
+  );
+  if (wallets.length === 0) {
     throw new Error("At least one wallet address (EVM, Solana) must be provided.");
   }
-  const orders = await (0, import_intents_sdk13.fetchUserOrders)(evmAddress, solAddress);
-  return orders;
+  const results = await Promise.all(
+    wallets.map((wallet) => (0, import_intents_sdk13.fetchUserOrders)({ wallet }))
+  );
+  return results.reduce(
+    (merged, orders) => {
+      merged.singleChainLimitOrders.push(...orders.singleChainLimitOrders);
+      merged.crossChainLimitOrders.push(...orders.crossChainLimitOrders);
+      return merged;
+    },
+    { singleChainLimitOrders: [], crossChainLimitOrders: [] }
+  );
 }
 
 // src/core/orders/cancelOrder.ts
 var import_intents_sdk14 = require("@shogun-sdk/intents-sdk");
 var import_web32 = require("@solana/web3.js");
 var import_viem8 = require("viem");
-async function cancelIntentsOrder({
+var inFlightCancels = /* @__PURE__ */ new Map();
+function cancelIntentsOrder(args) {
+  const srcChain = "srcChainId" in args.order ? args.order.srcChainId : args.order.chainId;
+  const key = `${srcChain}:${args.order.orderId}`;
+  const existing = inFlightCancels.get(key);
+  if (existing) return existing;
+  const pending = performCancel(args).finally(() => {
+    inFlightCancels.delete(key);
+  });
+  inFlightCancels.set(key, pending);
+  return pending;
+}
+async function performCancel({
   order,
   wallet,
   sol_rpc
@@ -1566,6 +1590,7 @@ var BALANCE_KEY = "balances-global";
 function useBalances(initialParams, options) {
   const sdk = useSwap();
   const abortRef = (0, import_react3.useRef)(null);
+  const lastDataRef = (0, import_react3.useRef)(null);
   const paramsRef = globalThis.__BALANCES_PARAMS_REF__ ?? (globalThis.__BALANCES_PARAMS_REF__ = { current: initialParams ?? null });
   const fetcher = (0, import_react3.useCallback)(async () => {
     const activeParams = paramsRef.current;
@@ -1574,9 +1599,11 @@ function useBalances(initialParams, options) {
     const controller = new AbortController();
     abortRef.current = controller;
     try {
-      return await sdk.getBalances(activeParams, { signal: controller.signal });
+      const balances = await sdk.getBalances(activeParams, { signal: controller.signal });
+      lastDataRef.current = balances;
+      return balances;
     } catch (err) {
-      if (err instanceof DOMException && err.name === "AbortError") return null;
+      if (err instanceof DOMException && err.name === "AbortError") return lastDataRef.current;
       if (err instanceof Error) throw err;
       throw new Error(String(err));
     }
@@ -1584,7 +1611,10 @@ function useBalances(initialParams, options) {
   const {
     data,
     error,
-    isValidating: loading,
+    // `isLoading` is only true on the initial fetch (no data yet), so background
+    // refreshes on `refreshInterval` don't toggle it and flicker the UI.
+    isLoading: loading,
+    isValidating,
     mutate: mutateBalances
   } = (0, import_swr2.default)(BALANCE_KEY, fetcher, {
     revalidateOnFocus: false,
@@ -1614,6 +1644,9 @@ function useBalances(initialParams, options) {
     () => ({
       data,
       loading,
+      // True during background revalidation (e.g. `refreshInterval` polls) while
+      // previous `data` stays visible — use for a subtle refresh indicator.
+      isValidating,
       error: error instanceof Error ? error : null,
       refetch,
       setParams,
@@ -1621,7 +1654,7 @@ function useBalances(initialParams, options) {
         return paramsRef.current;
       }
     }),
-    [data, loading, error, refetch, setParams, paramsRef]
+    [data, loading, isValidating, error, refetch, setParams, paramsRef]
   );
 }
 

package/dist/react.d.cts

@@ -202,6 +202,7 @@ declare function useBalances(initialParams?: BalanceRequestParams | null, option
 }): {
     data: BalanceResponse | null | undefined;
     loading: boolean;
+    isValidating: boolean;
     error: Error | null;
     refetch: () => Promise<void>;
     setParams: (next: BalanceRequestParams | null) => void;

package/dist/react.d.ts

@@ -202,6 +202,7 @@ declare function useBalances(initialParams?: BalanceRequestParams | null, option
 }): {
     data: BalanceResponse | null | undefined;
     loading: boolean;
+    isValidating: boolean;
     error: Error | null;
     refetch: () => Promise<void>;
     setParams: (next: BalanceRequestParams | null) => void;

package/dist/react.js

@@ -957,11 +957,23 @@ async function getOrders({
   evmAddress,
   solAddress
 }) {
-  if (!evmAddress && !solAddress) {
+  const wallets = [evmAddress, solAddress].filter(
+    (wallet) => Boolean(wallet)
+  );
+  if (wallets.length === 0) {
     throw new Error("At least one wallet address (EVM, Solana) must be provided.");
   }
-  const orders = await fetchUserOrders(evmAddress, solAddress);
-  return orders;
+  const results = await Promise.all(
+    wallets.map((wallet) => fetchUserOrders({ wallet }))
+  );
+  return results.reduce(
+    (merged, orders) => {
+      merged.singleChainLimitOrders.push(...orders.singleChainLimitOrders);
+      merged.crossChainLimitOrders.push(...orders.crossChainLimitOrders);
+      return merged;
+    },
+    { singleChainLimitOrders: [], crossChainLimitOrders: [] }
+  );
 }
 
 // src/core/orders/cancelOrder.ts
@@ -978,7 +990,19 @@ import {
   VersionedTransaction as VersionedTransaction2
 } from "@solana/web3.js";
 import { encodeFunctionData as encodeFunctionData3 } from "viem";
-async function cancelIntentsOrder({
+var inFlightCancels = /* @__PURE__ */ new Map();
+function cancelIntentsOrder(args) {
+  const srcChain = "srcChainId" in args.order ? args.order.srcChainId : args.order.chainId;
+  const key = `${srcChain}:${args.order.orderId}`;
+  const existing = inFlightCancels.get(key);
+  if (existing) return existing;
+  const pending = performCancel(args).finally(() => {
+    inFlightCancels.delete(key);
+  });
+  inFlightCancels.set(key, pending);
+  return pending;
+}
+async function performCancel({
   order,
   wallet,
   sol_rpc
@@ -1538,6 +1562,7 @@ var BALANCE_KEY = "balances-global";
 function useBalances(initialParams, options) {
   const sdk = useSwap();
   const abortRef = useRef2(null);
+  const lastDataRef = useRef2(null);
   const paramsRef = globalThis.__BALANCES_PARAMS_REF__ ?? (globalThis.__BALANCES_PARAMS_REF__ = { current: initialParams ?? null });
   const fetcher = useCallback2(async () => {
     const activeParams = paramsRef.current;
@@ -1546,9 +1571,11 @@ function useBalances(initialParams, options) {
     const controller = new AbortController();
     abortRef.current = controller;
     try {
-      return await sdk.getBalances(activeParams, { signal: controller.signal });
+      const balances = await sdk.getBalances(activeParams, { signal: controller.signal });
+      lastDataRef.current = balances;
+      return balances;
     } catch (err) {
-      if (err instanceof DOMException && err.name === "AbortError") return null;
+      if (err instanceof DOMException && err.name === "AbortError") return lastDataRef.current;
       if (err instanceof Error) throw err;
       throw new Error(String(err));
     }
@@ -1556,7 +1583,10 @@ function useBalances(initialParams, options) {
   const {
     data,
     error,
-    isValidating: loading,
+    // `isLoading` is only true on the initial fetch (no data yet), so background
+    // refreshes on `refreshInterval` don't toggle it and flicker the UI.
+    isLoading: loading,
+    isValidating,
     mutate: mutateBalances
   } = useSWR2(BALANCE_KEY, fetcher, {
     revalidateOnFocus: false,
@@ -1586,6 +1616,9 @@ function useBalances(initialParams, options) {
     () => ({
       data,
       loading,
+      // True during background revalidation (e.g. `refreshInterval` polls) while
+      // previous `data` stays visible — use for a subtle refresh indicator.
+      isValidating,
       error: error instanceof Error ? error : null,
       refetch,
       setParams,
@@ -1593,7 +1626,7 @@ function useBalances(initialParams, options) {
         return paramsRef.current;
       }
     }),
-    [data, loading, error, refetch, setParams, paramsRef]
+    [data, loading, isValidating, error, refetch, setParams, paramsRef]
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shogun-sdk/swap",
-  "version": "0.0.2-test.36",
+  "version": "0.0.2-test.38",
   "type": "module",
   "description": "Shogun Network Swap utilities and helpers",
   "author": "Shogun Network",
@@ -45,7 +45,7 @@
   "sideEffects": false,
   "dependencies": {
     "@solana/web3.js": "^1.98.4",
-    "@shogun-sdk/intents-sdk": "1.4.0"
+    "@shogun-sdk/intents-sdk": "1.4.1"
   },
   "devDependencies": {
     "@ethersproject/abstract-signer": "^5.7.0",