@owney/sdk 0.7.28-beta.3 → 0.7.28-beta.4

package/dist/index.cjs

@@ -3074,6 +3074,10 @@ var DEFAULT_POLL_MS2 = 5e3;
 var MAX_BACKOFF_MS = 3e4;
 var backoffFor = (failures, base4) => Math.min(base4 * 2 ** Math.min(failures, 5), MAX_BACKOFF_MS);
 var DEFAULT_TIMEOUT_MS2 = 15 * 60 * 1e3;
+var NOT_FOUND_GRACE_MS = 2 * 60 * 1e3;
+function isNotFound(error) {
+  return error instanceof OwneyError && error.details?.statusCode === 404;
+}
 async function runFusionOrder(deps, options) {
   const {
     orderHash,
@@ -3084,6 +3088,7 @@ async function runFusionOrder(deps, options) {
   } = options;
   const deadline = deps.now() + timeoutMs;
   let failures = 0;
+  let notFoundSince;
   const published = /* @__PURE__ */ new Set();
   onStage?.("swapping");
   for (; ; ) {
@@ -3125,7 +3130,20 @@ async function runFusionOrder(deps, options) {
     try {
       ({ status } = await deps.orderStatus(orderHash));
       failures = 0;
-    } catch {
+      notFoundSince = void 0;
+    } catch (error) {
+      if (isNotFound(error)) {
+        notFoundSince ??= deps.now();
+        if (deps.now() - notFoundSince >= NOT_FOUND_GRACE_MS) {
+          throw new OwneyError(
+            "SWAP_ORDER_NOT_FOUND",
+            "The swap provider has no record of this order, so nothing was exchanged.",
+            { orderHash }
+          );
+        }
+      } else {
+        notFoundSince = void 0;
+      }
       failures += 1;
       await deps.sleep(backoffFor(failures, pollIntervalMs));
       continue;
@@ -3183,9 +3201,9 @@ async function runSameChainOrder(deps, options) {
   for (; ; ) {
     if (deps.now() >= deadline) {
       throw new OwneyError(
-        "SWAP_ORDER_EXPIRED",
-        "No one filled the swap in time. Nothing was exchanged and your funds are still in your wallet.",
-        { orderHash }
+        "SWAP_REQUEST_FAILED",
+        "Timed out waiting for the swap to fill. It may still complete \u2014 if it does, the swapped funds will be in your wallet. Check before retrying.",
+        { orderHash, settlementUnconfirmed: true }
       );
     }
     let status;
@@ -3533,10 +3551,16 @@ async function runFusion(deps, options, walletAddress) {
   debugLog("owney-sdk", "swap: awaiting signature in wallet", {
     signingOnChain: quote.src.chainId
   });
-  const signature = await awaitWalletPrompt(
-    () => deps.signTypedData(built.typedData),
-    "sign the swap"
-  );
+  let signature;
+  try {
+    signature = await awaitWalletPrompt(
+      () => deps.signTypedData(built.typedData),
+      "sign the swap"
+    );
+  } catch (error) {
+    clearOrder(built.orderHash);
+    throw error;
+  }
   debugLog("owney-sdk", "swap: signed, submitting to relayer");
   await deps.api.submitOrder({
     srcChainId: quote.src.chainId,
@@ -3564,7 +3588,7 @@ async function runFusion(deps, options, walletAddress) {
       ...onStage ? { onStage } : {}
     });
   } catch (error) {
-    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
       clearOrder(built.orderHash);
     }
     throw error;
@@ -5799,7 +5823,7 @@ var OwneySDK = class {
           status: "completed"
         });
       } catch (error) {
-        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
           clearOrder(order.orderHash);
           updateWithdrawSwap(order.orderHash, { status: "refunded" });
         } else {

package/dist/index.d.cts

@@ -964,7 +964,7 @@ type AgentApyOptions = {
     chainId?: number;
 };
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "SWAP_ORDER_NOT_FOUND" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;

package/dist/index.d.ts

@@ -964,7 +964,7 @@ type AgentApyOptions = {
     chainId?: number;
 };
 
-type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
+type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "WALLET_NOT_DEPLOYED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "CHAIN_MISMATCH" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_BALANCE_UNAVAILABLE" | "DEPOSIT_PARTIAL_FAILURE" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "DEPOSIT_INSUFFICIENT_BALANCE" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_NOTHING_TO_WITHDRAW" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "AGENT_RATE_LIMITED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "PERMIT2_APPROVAL_REQUIRED" | "SPONSORED_CALLS_UNSUPPORTED" | "SPONSORED_CALLS_NO_ID" | "SPONSORED_CALLS_NO_RECEIPT" | "SWAP_DISABLED" | "SWAP_RATE_LIMITED" | "SWAP_REQUEST_FAILED" | "SWAP_QUOTE_FAILED" | "SWAP_UNSUPPORTED_PAIR" | "SWAP_APPROVAL_REQUIRED" | "SWAP_BELOW_DEPOSIT_MINIMUM" | "SWAP_DEPOSIT_PENDING" | "SWAP_WALLET_PROMPT_TIMEOUT" | "SWAP_INSUFFICIENT_GAS" | "SWAP_NATIVE_UNSUPPORTED" | "SWAP_ORDER_EXPIRED" | "SWAP_ORDER_REFUNDED" | "SWAP_ORDER_CANCELLED" | "SWAP_ORDER_NOT_FOUND" | "WITHDRAW_ARRIVAL_TIMEOUT" | "WITHDRAW_SWAP_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "POOL_CATALOG_UNSUPPORTED" | "POOL_SELECTION_UNSUPPORTED" | "VALIDATION_INVALID_DAYS";
 declare class OwneyError extends Error {
     readonly code: OwneyErrorCode;
     readonly details?: Record<string, unknown>;

package/dist/index.js

@@ -3044,6 +3044,10 @@ var DEFAULT_POLL_MS2 = 5e3;
 var MAX_BACKOFF_MS = 3e4;
 var backoffFor = (failures, base4) => Math.min(base4 * 2 ** Math.min(failures, 5), MAX_BACKOFF_MS);
 var DEFAULT_TIMEOUT_MS2 = 15 * 60 * 1e3;
+var NOT_FOUND_GRACE_MS = 2 * 60 * 1e3;
+function isNotFound(error) {
+  return error instanceof OwneyError && error.details?.statusCode === 404;
+}
 async function runFusionOrder(deps, options) {
   const {
     orderHash,
@@ -3054,6 +3058,7 @@ async function runFusionOrder(deps, options) {
   } = options;
   const deadline = deps.now() + timeoutMs;
   let failures = 0;
+  let notFoundSince;
   const published = /* @__PURE__ */ new Set();
   onStage?.("swapping");
   for (; ; ) {
@@ -3095,7 +3100,20 @@ async function runFusionOrder(deps, options) {
     try {
       ({ status } = await deps.orderStatus(orderHash));
       failures = 0;
-    } catch {
+      notFoundSince = void 0;
+    } catch (error) {
+      if (isNotFound(error)) {
+        notFoundSince ??= deps.now();
+        if (deps.now() - notFoundSince >= NOT_FOUND_GRACE_MS) {
+          throw new OwneyError(
+            "SWAP_ORDER_NOT_FOUND",
+            "The swap provider has no record of this order, so nothing was exchanged.",
+            { orderHash }
+          );
+        }
+      } else {
+        notFoundSince = void 0;
+      }
       failures += 1;
       await deps.sleep(backoffFor(failures, pollIntervalMs));
       continue;
@@ -3153,9 +3171,9 @@ async function runSameChainOrder(deps, options) {
   for (; ; ) {
     if (deps.now() >= deadline) {
       throw new OwneyError(
-        "SWAP_ORDER_EXPIRED",
-        "No one filled the swap in time. Nothing was exchanged and your funds are still in your wallet.",
-        { orderHash }
+        "SWAP_REQUEST_FAILED",
+        "Timed out waiting for the swap to fill. It may still complete \u2014 if it does, the swapped funds will be in your wallet. Check before retrying.",
+        { orderHash, settlementUnconfirmed: true }
       );
     }
     let status;
@@ -3503,10 +3521,16 @@ async function runFusion(deps, options, walletAddress) {
   debugLog("owney-sdk", "swap: awaiting signature in wallet", {
     signingOnChain: quote.src.chainId
   });
-  const signature = await awaitWalletPrompt(
-    () => deps.signTypedData(built.typedData),
-    "sign the swap"
-  );
+  let signature;
+  try {
+    signature = await awaitWalletPrompt(
+      () => deps.signTypedData(built.typedData),
+      "sign the swap"
+    );
+  } catch (error) {
+    clearOrder(built.orderHash);
+    throw error;
+  }
   debugLog("owney-sdk", "swap: signed, submitting to relayer");
   await deps.api.submitOrder({
     srcChainId: quote.src.chainId,
@@ -3534,7 +3558,7 @@ async function runFusion(deps, options, walletAddress) {
       ...onStage ? { onStage } : {}
     });
   } catch (error) {
-    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+    if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
       clearOrder(built.orderHash);
     }
     throw error;
@@ -5780,7 +5804,7 @@ var OwneySDK = class {
           status: "completed"
         });
       } catch (error) {
-        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED")) {
+        if (error instanceof OwneyError && (error.code === "SWAP_ORDER_REFUNDED" || error.code === "SWAP_ORDER_CANCELLED" || error.code === "SWAP_ORDER_NOT_FOUND")) {
           clearOrder(order.orderHash);
           updateWithdrawSwap(order.orderHash, { status: "refunded" });
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.7.28-beta.3",
+  "version": "0.7.28-beta.4",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",