@trustware/sdk-staging 1.1.10-staging.0 → 1.1.11-staging.2

package/dist/smart-account.d.cts

@@ -311,8 +311,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             [x: `uint[${string}]`]: undefined;
             [x: `function[${string}]`]: undefined;
             [x: `bytes18[${string}]`]: undefined;
-            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes1[${string}]`]: undefined;
+            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
             [x: `bytes8[${string}]`]: undefined;
@@ -411,8 +411,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             bool?: undefined;
             bytes?: undefined;
             bytes18?: undefined;
-            bytes16?: undefined;
             bytes1?: undefined;
+            bytes16?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
             bytes8?: undefined;
@@ -518,8 +518,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             [x: `uint[${string}]`]: undefined;
             [x: `function[${string}]`]: undefined;
             [x: `bytes18[${string}]`]: undefined;
-            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes1[${string}]`]: undefined;
+            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
             [x: `bytes8[${string}]`]: undefined;
@@ -618,8 +618,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             bool?: undefined;
             bytes?: undefined;
             bytes18?: undefined;
-            bytes16?: undefined;
             bytes1?: undefined;
+            bytes16?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
             bytes8?: undefined;
@@ -2761,8 +2761,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -2861,8 +2861,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -2984,8 +2984,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -3084,8 +3084,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -3458,8 +3458,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -3558,8 +3558,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -3681,8 +3681,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -3781,8 +3781,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -3953,6 +3953,11 @@ type RoutePlan = {
     };
     steps?: unknown[];
     provider?: string;
+    /** The winning provider's own correlation ID, not Trustware's — it is
+     *  absent when that provider issued none, and it is what lands on the
+     *  intent as `providerRequestId`. Trustware's request ID for the same call
+     *  comes back in the `X-Request-Id` response header (the provider's is also
+     *  mirrored there as `X-Provider-Request-Id`). */
     requestId?: string;
     reliabilityScore?: number;
     diagnostics?: {

package/dist/smart-account.d.ts

@@ -311,8 +311,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             [x: `uint[${string}]`]: undefined;
             [x: `function[${string}]`]: undefined;
             [x: `bytes18[${string}]`]: undefined;
-            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes1[${string}]`]: undefined;
+            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
             [x: `bytes8[${string}]`]: undefined;
@@ -411,8 +411,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             bool?: undefined;
             bytes?: undefined;
             bytes18?: undefined;
-            bytes16?: undefined;
             bytes1?: undefined;
+            bytes16?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
             bytes8?: undefined;
@@ -518,8 +518,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             [x: `uint[${string}]`]: undefined;
             [x: `function[${string}]`]: undefined;
             [x: `bytes18[${string}]`]: undefined;
-            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes1[${string}]`]: undefined;
+            [x: `bytes16[${string}]`]: undefined;
             [x: `bytes2[${string}]`]: undefined;
             [x: `bytes3[${string}]`]: undefined;
             [x: `bytes8[${string}]`]: undefined;
@@ -618,8 +618,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
             bool?: undefined;
             bytes?: undefined;
             bytes18?: undefined;
-            bytes16?: undefined;
             bytes1?: undefined;
+            bytes16?: undefined;
             bytes2?: undefined;
             bytes3?: undefined;
             bytes8?: undefined;
@@ -2761,8 +2761,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -2861,8 +2861,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -2984,8 +2984,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -3084,8 +3084,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -3458,8 +3458,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -3558,8 +3558,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -3681,8 +3681,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 [x: `uint[${string}]`]: undefined;
                 [x: `function[${string}]`]: undefined;
                 [x: `bytes18[${string}]`]: undefined;
-                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes1[${string}]`]: undefined;
+                [x: `bytes16[${string}]`]: undefined;
                 [x: `bytes2[${string}]`]: undefined;
                 [x: `bytes3[${string}]`]: undefined;
                 [x: `bytes8[${string}]`]: undefined;
@@ -3781,8 +3781,8 @@ declare function createTrustwareSmartAccountClient(eoaAddress: `0x${string}`, ch
                 bool?: undefined;
                 bytes?: undefined;
                 bytes18?: undefined;
-                bytes16?: undefined;
                 bytes1?: undefined;
+                bytes16?: undefined;
                 bytes2?: undefined;
                 bytes3?: undefined;
                 bytes8?: undefined;
@@ -3953,6 +3953,11 @@ type RoutePlan = {
     };
     steps?: unknown[];
     provider?: string;
+    /** The winning provider's own correlation ID, not Trustware's — it is
+     *  absent when that provider issued none, and it is what lands on the
+     *  intent as `providerRequestId`. Trustware's request ID for the same call
+     *  comes back in the `X-Request-Id` response header (the provider's is also
+     *  mirrored there as `X-Provider-Request-Id`). */
     requestId?: string;
     reliabilityScore?: number;
     diagnostics?: {

package/dist/smart-account.mjs

@@ -12241,7 +12241,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.10-staging.0";
+    SDK_VERSION = "1.1.11-staging.2";
     API_ROOT = "https://bv-staging-api.trustware.io";
     API_PREFIX = "/api";
   }
@@ -12262,16 +12262,14 @@ var init_defaults3 = __esm({
 });
 
 // src/types/config.ts
-var DEFAULT_RETRY_CONFIG, DEFAULT_FEATURE_FLAGS;
+var DEFAULT_RETRY_CONFIG, RATE_LIMIT_WAIT_BUDGET_MS, DEFAULT_FEATURE_FLAGS;
 var init_config = __esm({
   "src/types/config.ts"() {
     "use strict";
     DEFAULT_RETRY_CONFIG = {
-      autoRetry: true,
-      maxRetries: 3,
-      baseDelayMs: 1e3,
       approachingThreshold: 5
     };
+    RATE_LIMIT_WAIT_BUDGET_MS = 1e4;
     DEFAULT_FEATURE_FLAGS = {
       tokensPagination: true,
       balanceStreaming: false,
@@ -13547,9 +13545,6 @@ function resolveConfig(input) {
   const theme = input.theme ?? "system";
   const messages = deepMerge(DEFAULT_MESSAGES, input.messages);
   const retry = {
-    autoRetry: input.retry?.autoRetry ?? DEFAULT_RETRY_CONFIG.autoRetry,
-    maxRetries: input.retry?.maxRetries ?? DEFAULT_RETRY_CONFIG.maxRetries,
-    baseDelayMs: input.retry?.baseDelayMs ?? DEFAULT_RETRY_CONFIG.baseDelayMs,
     approachingThreshold: input.retry?.approachingThreshold ?? DEFAULT_RETRY_CONFIG.approachingThreshold,
     onRateLimitInfo: input.retry?.onRateLimitInfo,
     onRateLimited: input.retry?.onRateLimited,
@@ -13660,60 +13655,66 @@ function notifyRateLimitCallbacks(info, isRateLimited, retryCount) {
     retry.onRateLimitApproaching(info, retry.approachingThreshold);
   }
 }
-function calculateBackoffDelay(baseDelayMs, retryCount, retryAfter) {
-  if (retryAfter && retryAfter > 0) {
-    return retryAfter * 1e3;
+function serverDirectedWaitMs(info) {
+  if (!info) return null;
+  if (typeof info.retryAfter === "number" && info.retryAfter > 0) {
+    return info.retryAfter * 1e3;
   }
-  return baseDelayMs * Math.pow(2, retryCount);
+  if (typeof info.reset === "number" && info.reset > 0) {
+    const untilReset = info.reset * 1e3 - Date.now();
+    if (untilReset > 0) return untilReset;
+  }
+  return null;
 }
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function rateLimitedFetch(url, options = {}) {
-  const { skipRateLimit, ...fetchOptions } = options;
-  const cfg = TrustwareConfigStore.get();
-  if (!cfg.retry.autoRetry || skipRateLimit) {
-    return fetch(url, fetchOptions);
-  }
-  const { maxRetries, baseDelayMs } = cfg.retry;
+async function withRateLimitRetry(attempt) {
+  let waitedMs = 0;
   let retryCount = 0;
   while (true) {
-    const response = await fetch(url, fetchOptions);
+    const response = await attempt();
     const rateLimitInfo = parseRateLimitHeaders(response);
-    if (response.status === 429) {
+    if (response.status !== 429) {
       if (rateLimitInfo) {
-        notifyRateLimitCallbacks(rateLimitInfo, true, retryCount);
-      }
-      if (retryCount >= maxRetries) {
-        throw new RateLimitError(
-          rateLimitInfo || { limit: 0, remaining: 0, reset: 0 },
-          true
-        );
+        notifyRateLimitCallbacks(rateLimitInfo, false, 0);
       }
-      const delay = calculateBackoffDelay(
-        baseDelayMs,
-        retryCount,
-        rateLimitInfo?.retryAfter
-      );
-      await sleep(delay);
-      retryCount++;
-      continue;
+      return response;
     }
     if (rateLimitInfo) {
-      notifyRateLimitCallbacks(rateLimitInfo, false, 0);
+      notifyRateLimitCallbacks(rateLimitInfo, true, retryCount);
+    }
+    const waitMs = serverDirectedWaitMs(rateLimitInfo);
+    const info = rateLimitInfo || { limit: 0, remaining: 0, reset: 0 };
+    if (waitMs === null) {
+      throw new RateLimitError(info, true);
+    }
+    if (waitedMs + waitMs > RATE_LIMIT_WAIT_BUDGET_MS) {
+      throw new RateLimitError(info, false);
     }
-    return response;
+    await sleep(waitMs);
+    waitedMs += waitMs;
+    retryCount++;
   }
 }
+async function rateLimitedFetch(url, options = {}) {
+  const { skipRateLimit, ...fetchOptions } = options;
+  if (skipRateLimit) {
+    return fetch(url, fetchOptions);
+  }
+  return withRateLimitRetry(() => fetch(url, fetchOptions));
+}
 var RateLimitError;
 var init_http = __esm({
   "src/core/http.ts"() {
     "use strict";
     init_constants();
     init_config2();
+    init_config();
     RateLimitError = class extends Error {
       constructor(info, retriesExhausted) {
-        const message = retriesExhausted ? `Rate limit exceeded after max retries. Try again in ${info.retryAfter ?? Math.ceil((info.reset * 1e3 - Date.now()) / 1e3)} seconds.` : `Rate limit exceeded. Try again in ${info.retryAfter} seconds.`;
+        const seconds = info.retryAfter ?? (info.reset > 0 ? Math.max(0, Math.ceil((info.reset * 1e3 - Date.now()) / 1e3)) : null);
+        const message = seconds === null ? "Rate limit exceeded. The server did not say when to retry." : `Rate limit exceeded. Try again in ${seconds} seconds.`;
         super(message);
         this.name = "RateLimitError";
         this.rateLimitInfo = info;
@@ -13730,7 +13731,7 @@ import {
   keccak256 as keccak2565,
   stringToHex
 } from "viem";
-async function fetchWithTimeout(url, init) {
+async function fetchOnceWithTimeout(url, init) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
   try {
@@ -13751,6 +13752,9 @@ async function fetchWithTimeout(url, init) {
     clearTimeout(timer);
   }
 }
+async function fetchWithTimeout(url, init) {
+  return withRateLimitRetry(() => fetchOnceWithTimeout(url, init));
+}
 function extractRevertHex(err) {
   if (typeof err.data === "string" && err.data.startsWith("0x"))
     return err.data;
@@ -14250,7 +14254,7 @@ async function estimateRelayFeeInToken(valueWei, fromAmountWei, fromAmountUSD, c
     tokenUnitsPerDollar = Number(fromAmountWei) / fromUSD;
   } else if (fromToken && fromDecimals !== void 0) {
     try {
-      const resp = await fetch(
+      const resp = await rateLimitedFetch(
         `${apiBase()}/v1/price/token?chainId=${cid}&address=${fromToken}`,
         { headers: jsonHeaders() }
       );
@@ -14266,9 +14270,10 @@ async function estimateRelayFeeInToken(valueWei, fromAmountWei, fromAmountUSD, c
     return 0n;
   }
   try {
-    const resp = await fetch(`${apiBase()}/v1/price/native?chainId=${cid}`, {
-      headers: jsonHeaders()
-    });
+    const resp = await rateLimitedFetch(
+      `${apiBase()}/v1/price/native?chainId=${cid}`,
+      { headers: jsonHeaders() }
+    );
     if (!resp.ok) throw new Error(`native price HTTP ${resp.status}`);
     const json = await resp.json();
     const ethPriceUSD = parseFloat(json.data?.priceUSD ?? "0");