0xtrails 0.16.0 → 0.16.1

package/dist/recover.js

@@ -1,51 +1,54 @@
-import { logger as q } from "./logger/index.js";
-import { getChainInfo as P, getPublicClient as F } from "./chains.js";
-import { normalizeAddress as x } from "./utils/address.js";
-import { isPositiveBigInt as Z } from "./utils/validation.js";
-import { getERC20TransferData as ee } from "./utils.js";
-import { attemptSwitchChain as ne } from "./chainSwitch.js";
-import { abortIntent as te } from "./intents.js";
-import { decodeGuestModuleEvents as $ } from "./decoders.js";
-import { WIDGET_REFRESH_INTERVAL as re, useTokenBalancesForMultipleAccounts as oe } from "./query/balance.hooks.js";
-import { useTrailsClient as H } from "./trailsClient.js";
-import { useGetIntent as ae } from "./hooks/useGetIntent.js";
-import { useKeyMachineClient as se } from "./keyMachineClient.js";
-import { Constants as G, Erc6492 as ie, Payload as b, Signature as K } from "@0xsequence/wallet-primitives";
-import { parseSignature as ce, zeroAddress as R } from "viem";
-import { useCallback as I, useMemo as w } from "react";
-import { checkProviderHealth as X, signWithTimeout as J, wrapWalletClient as W } from "@0xtrails/wallet";
-import { AbiFunction as de, Address as f, Bytes as B } from "ox";
-async function le(e, t) {
-  const r = await F(t).getCode({ address: e }), n = r !== void 0 && r !== "0x";
-  return q.console.log("[refund] Address deployment check:", {
+import { logger as k } from "./logger/index.js";
+import { getChainInfo as L, getPublicClient as D } from "./chains.js";
+import { normalizeAddress as B } from "./utils/address.js";
+import { isPositiveBigInt as ae } from "./utils/validation.js";
+import { getERC20TransferData as se } from "./utils.js";
+import { attemptSwitchChain as ie } from "./chainSwitch.js";
+import { abortIntent as ce } from "./intents.js";
+import { decodeGuestModuleEvents as W } from "./decoders.js";
+import { getChainIndexerUrl as de } from "./indexerClient.js";
+import { WIDGET_REFRESH_INTERVAL as le, useTokenBalancesForMultipleAccounts as ue } from "./query/balance.hooks.js";
+import { useTrails as fe } from "./widget/providers/TrailsProvider.js";
+import { useTrailsClient as M } from "./trailsClient.js";
+import { useGetIntent as he } from "./hooks/useGetIntent.js";
+import { useKeyMachineClient as ge } from "./keyMachineClient.js";
+import { Constants as O, Erc6492 as ye, Payload as R, Signature as U } from "@0xsequence/wallet-primitives";
+import { zeroAddress as E } from "viem";
+import { useCallback as A, useMemo as I } from "react";
+import { checkProviderHealth as K, signWithTimeout as V, wrapWalletClient as G } from "@0xtrails/wallet";
+import { AbiFunction as pe, Address as f, Bytes as H } from "ox";
+import { SequenceIndexer as we } from "@0xsequence/indexer";
+async function ve(e, t) {
+  const n = await D(t).getCode({ address: e }), r = n !== void 0 && n !== "0x";
+  return k.console.log("[refund] Address deployment check:", {
     address: e,
     chainId: t,
-    codeLength: r?.length ?? 0,
-    isDeployed: n
-  }), n;
+    codeLength: n?.length ?? 0,
+    isDeployed: r
+  }), r;
 }
-async function Pe(e, t, r, n) {
+async function en(e, t, n, r) {
   if (!e.account) throw new Error("Wallet client account is required for signing");
-  await X(e);
-  const o = b.toTyped(f.from(t), r, n), a = await J(e.signTypedData({
+  await K(e);
+  const o = R.toTyped(f.from(t), n, r), a = await V(e.signTypedData({
     account: e.account,
     ...o
   }), "Payload signature");
-  return q.console.log("[refund] Signature received:", a), a;
+  return k.console.log("[refund] Signature received:", a), a;
 }
-async function Fe(e) {
-  const { trailsClient: t, intentId: r, payload: n, intentAddress: o, signature: a } = e, s = n.calls[0];
+async function nn(e) {
+  const { trailsClient: t, intentId: n, payload: r, intentAddress: o, signature: a } = e, s = r.calls[0];
   if (!s) throw new Error("Refund call not found in payload");
-  if (f.isEqual(s.to, R)) throw new Error("Refund call 'to' address cannot be zero address");
-  if (!o || f.isEqual(o, R)) throw new Error("Intent address cannot be zero address");
+  if (f.isEqual(s.to, E)) throw new Error("Refund call 'to' address cannot be zero address");
+  if (!o || f.isEqual(o, E)) throw new Error("Intent address cannot be zero address");
   const i = {
     kind: "v3_calls_payload",
     encoding: "hex",
-    encoded: B.toHex(b.encode(n)),
+    encoded: H.toHex(R.encode(r)),
     intentAddress: o,
-    chainId: n.type === "call" ? Number(e.chainId) : void 0
+    chainId: r.type === "call" ? Number(e.chainId) : void 0
   }, d = await t.buildIntentRecoveryTransaction({
-    intentId: r,
+    intentId: n,
     payload: i,
     signature: a,
     intentAddress: o
@@ -55,12 +58,12 @@ async function Fe(e) {
     data: d.data
   };
 }
-function ue(e, t) {
+function Ie(e, t) {
   if (e && typeof e == "object" && "kind" in e && e.kind === "v3_calls_payload") {
-    const r = e;
-    if (r.encoding !== "hex" || !r.encoded) throw new Error("PrepareIntentRecovery returned invalid canonical payload encoding");
-    const n = r.intentAddress ? f.from(r.intentAddress) : t, o = b.decode(B.fromHex(r.encoded), n);
-    if (!b.isCalls(o)) throw new Error("PrepareIntentRecovery returned non-call payload for recovery");
+    const n = e;
+    if (n.encoding !== "hex" || !n.encoded) throw new Error("PrepareIntentRecovery returned invalid canonical payload encoding");
+    const r = n.intentAddress ? f.from(n.intentAddress) : t, o = R.decode(H.fromHex(n.encoded), r);
+    if (!R.isCalls(o)) throw new Error("PrepareIntentRecovery returned non-call payload for recovery");
     const a = o.calls?.[0];
     if (!a) throw new Error("PrepareIntentRecovery returned invalid payload: refund call missing");
     return {
@@ -70,90 +73,90 @@ function ue(e, t) {
   }
   throw new Error("PrepareIntentRecovery returned unsupported payload format (expected v3_calls_payload)");
 }
-function V(e) {
+function $(e) {
   if (!e?.tokens) return 0;
   let t = 0;
-  for (const r of e.tokens) {
-    const n = r.balanceUsd || 0;
-    n > t && (t = n);
+  for (const n of e.tokens) {
+    const r = n.balanceUsd || 0;
+    r > t && (t = r);
   }
   return t;
 }
-function j(e) {
+function z(e) {
   if (!e?.tokens) return 0n;
   let t = 0n;
-  for (const r of e.tokens) {
-    const n = BigInt(r.balance || "0");
-    n > t && (t = n);
+  for (const n of e.tokens) {
+    const r = BigInt(n.balance || "0");
+    r > t && (t = r);
   }
   return t;
 }
-function N(e, t, r, n, o) {
-  const a = V(t), s = V(r), i = j(t), d = j(r);
-  let l = !1;
-  o && (a > 0 && s > 0 ? l = s > a : s > 0 && a === 0 ? l = !0 : a > 0 && s === 0 ? l = !1 : l = d > i);
-  const c = () => !e.originIntentAddress || !n ? null : {
-    address: n,
+function j(e, t, n, r, o) {
+  const a = $(t), s = $(n), i = z(t), d = z(n);
+  let c = !1;
+  o && (a > 0 && s > 0 ? c = s > a : s > 0 && a === 0 ? c = !0 : a > 0 && s === 0 ? c = !1 : c = d > i);
+  const u = () => !e.originIntentAddress || !r ? null : {
+    address: r,
     chainId: Number(e.originChainId || 0),
     intentAddress: f.from(e.originIntentAddress),
     tokenBalancesData: t,
     isOrigin: !0
   };
-  if (l) {
-    const h = e.destinationChainId;
-    return !h || !e.destinationIntentAddress || !o ? c() : {
+  if (c) {
+    const l = e.destinationChainId;
+    return !l || !e.destinationIntentAddress || !o ? u() : {
       address: o,
-      chainId: Number(h),
+      chainId: Number(l),
       intentAddress: f.from(e.destinationIntentAddress),
-      tokenBalancesData: r,
+      tokenBalancesData: n,
       isOrigin: !1
     };
   }
-  return c();
+  return u();
 }
-function L(e, t) {
-  const r = (n) => {
-    if (!n?.tokens) return !1;
-    for (const o of n.tokens) if (Z(o.balance || "0")) return !0;
+function X(e, t) {
+  const n = (r) => {
+    if (!r?.tokens) return !1;
+    for (const o of r.tokens) if (ae(o.balance || "0")) return !0;
     return !1;
   };
-  return r(e) || r(t);
+  return n(e) || n(t);
 }
-function _(e) {
+function Y(e) {
   if (!e?.tokenBalancesData?.tokens) return null;
-  let t = null, r = 0n;
-  for (const n of e.tokenBalancesData.tokens) {
-    const o = BigInt(n.balance || "0");
-    o > 0n && o > r && (r = o, t = n);
+  let t = null, n = 0n;
+  for (const r of e.tokenBalancesData.tokens) {
+    const o = BigInt(r.balance || "0");
+    o > 0n && o > n && (n = o, t = r);
   }
   return t;
 }
-function O(e) {
+function J(e) {
   if (!e) throw new Error("Refund address is required. Provide refundToAddress or connect a wallet with a valid address");
-  if (f.isEqual(e, R)) throw new Error("Refund address cannot be zero address");
+  if (f.isEqual(e, E)) throw new Error("Refund address cannot be zero address");
 }
-async function z(e) {
-  const { txHash: t, chainId: r } = e, n = F(r);
+async function Q(e) {
+  const { txHash: t, chainId: n } = e, r = D(n);
   try {
-    if (await n.getTransaction({ hash: t })) try {
-      const o = await n.getTransactionReceipt({ hash: t });
-      return o.status === "reverted" ? { status: "fail" } : $(o).some((a) => a.type === "CallFailed") ? { status: "fail" } : { status: "success" };
+    if (await r.getTransaction({ hash: t })) try {
+      const o = await r.getTransactionReceipt({ hash: t });
+      return o.status === "reverted" ? { status: "fail" } : W(o).some((a) => a.type === "CallFailed") ? { status: "fail" } : { status: "success" };
     } catch {
       return { status: "pending" };
     }
   } catch {
     try {
-      const o = await n.getTransactionReceipt({ hash: t });
-      return o.status === "reverted" ? { status: "fail" } : $(o).some((a) => a.type === "CallFailed") ? { status: "fail" } : { status: "success" };
+      const o = await r.getTransactionReceipt({ hash: t });
+      return o.status === "reverted" ? { status: "fail" } : W(o).some((a) => a.type === "CallFailed") ? { status: "fail" } : { status: "success" };
     } catch {
       return { status: "pending" };
     }
   }
   return { status: "pending" };
 }
-function M(e) {
+function Z(e) {
   if (!e) return null;
-  const t = P(e.chainId);
+  const t = L(e.chainId);
   return {
     address: e.address,
     chainId: e.chainId,
@@ -162,46 +165,84 @@ function M(e) {
     tokenBalancesData: e.tokenBalancesData
   };
 }
-async function Q(e) {
-  const { trailsClient: t, intentData: r, selected: n, effectiveRefundAddress: o, signature: a, payload: s } = e;
-  O(o);
+function me(e) {
+  if (e.length !== 132) throw new Error(`Invalid recovery signature length: expected 65 bytes, got ${(e.length - 2) / 2} bytes`);
+  const t = BigInt(`0x${e.slice(2, 66)}`), n = BigInt(`0x${e.slice(66, 130)}`), r = +`0x${e.slice(130)}`;
+  if (Number.isNaN(r)) throw new Error("Invalid recovery signature parity byte");
+  if (r === 0 || r === 27) return {
+    r: t,
+    s: n,
+    yParity: 0
+  };
+  if (r === 1 || r === 28) return {
+    r: t,
+    s: n,
+    yParity: 1
+  };
+  const o = r >= 27 ? (r - 27) % 2 : r % 2;
+  return k.console.warn("[recover] Normalizing non-standard signature parity", {
+    yParityOrV: r,
+    yParity: o
+  }), {
+    r: t,
+    s: n,
+    yParity: o
+  };
+}
+function Ae(e, t) {
+  if (e.length !== 132) return {
+    type: "erc1271",
+    address: t,
+    data: e
+  };
+  const n = me(e);
+  return {
+    type: "hash",
+    r: n.r,
+    s: n.s,
+    yParity: n.yParity
+  };
+}
+async function Te(e) {
+  const { trailsClient: t, intentData: n, selected: r, effectiveRefundAddress: o, signature: a, payload: s } = e;
+  J(o);
   const i = {
     kind: "v3_calls_payload",
     encoding: "hex",
-    encoded: B.toHex(b.encode(s)),
-    intentAddress: n.intentAddress,
-    chainId: n.chainId
+    encoded: H.toHex(R.encode(s)),
+    intentAddress: r.intentAddress,
+    chainId: r.chainId
   }, d = await t.buildIntentRecoveryTransaction({
-    intentId: r.intentId,
+    intentId: n.intentId,
     payload: i,
     signature: a,
-    intentAddress: n.intentAddress,
+    intentAddress: r.intentAddress,
     refundToAddress: o
-  }), l = Number(d.chainId), c = f.from(d.to);
-  if (!c || f.isEqual(c, R)) throw new Error("Refund transaction 'to' address cannot be zero address");
-  const h = P(l);
-  if (!h) throw new Error(`Chain info not found for chain ID: ${l}`);
+  }), c = Number(d.chainId), u = f.from(d.to);
+  if (!u || f.isEqual(u, E)) throw new Error("Refund transaction 'to' address cannot be zero address");
+  const l = L(c);
+  if (!l) throw new Error(`Chain info not found for chain ID: ${c}`);
   return {
-    to: c,
+    to: u,
     data: d.data,
-    chainId: l,
-    chain: h
+    chainId: c,
+    chain: l
   };
 }
-function fe() {
+function be() {
   if (!globalThis.crypto?.getRandomValues) throw new Error("Secure random generator not available for recovery space");
   const e = new Uint8Array(20);
   globalThis.crypto.getRandomValues(e);
-  const t = BigInt(`0x${Array.from(e, (r) => r.toString(16).padStart(2, "0")).join("")}`);
+  const t = BigInt(`0x${Array.from(e, (n) => n.toString(16).padStart(2, "0")).join("")}`);
   if (t <= 1n) throw new Error("Generated reserved recovery space");
   return t;
 }
-async function Y(e) {
-  const { trailsClient: t, intentData: r, selectedIntentAddress: n, effectiveRefundAddress: o } = e, a = await t.prepareIntentRecovery({
-    intentId: r.intentId,
-    intentAddress: n.intentAddress,
+async function ke(e) {
+  const { trailsClient: t, intentData: n, selectedIntentAddress: r, effectiveRefundAddress: o } = e, a = await t.prepareIntentRecovery({
+    intentId: n.intentId,
+    intentAddress: r.intentAddress,
     refundToAddress: o
-  }), { decodedPayload: s, refundCall: i } = ue(a.payload, n.intentAddress);
+  }), { decodedPayload: s, refundCall: i } = Ie(a.payload, r.intentAddress);
   return {
     payload: s,
     refundCall: i,
@@ -209,55 +250,155 @@ async function Y(e) {
     typedData: a.typedData
   };
 }
-async function U(e) {
-  const { walletClient: t, prepared: r } = e;
+async function ee(e) {
+  const { walletClient: t, prepared: n } = e;
   if (!t.account) throw new Error("Wallet client account is required for signing");
-  return await ne({
+  return await ie({
     walletClient: t,
-    desiredChainId: r.chainId
-  }), await X(t), {
-    signature: await J(t.signTypedData({
+    desiredChainId: n.chainId
+  }), await K(t), {
+    signature: await V(t.signTypedData({
       account: t.account,
-      ...r.typedData
+      ...n.typedData
     }), "Recovery signature"),
     signerAddress: t.account.address,
-    payload: r.payload,
-    refundCall: r.refundCall
+    payload: n.payload,
+    refundCall: n.refundCall
   };
 }
-async function D(e) {
-  const { trailsWalletClient: t, recoverTx: r, trailsClient: n, intentId: o } = e;
+var Re = 2e3, Ee = 6e4;
+function Ce(e) {
+  return new Promise((t) => setTimeout(t, e));
+}
+function xe(e) {
+  return typeof e == "string" && /^0x[0-9a-fA-F]{64}$/.test(e);
+}
+function _(e) {
+  if (xe(e)) return e;
+  if (typeof e == "string" && /^[0-9a-fA-F]{64}$/.test(e)) return `0x${e}`;
+}
+function P(e, t) {
+  let n = e;
+  for (const r of t) {
+    if (!n || typeof n != "object" || !(r in n)) return;
+    n = n[r];
+  }
+  return n;
+}
+function ne(e) {
+  const t = _(e);
+  if (t) return t;
+  const n = e, r = [
+    n?.data?.txHash,
+    n?.data?.nativeReceipt && P(n.data.nativeReceipt, ["transactionHash"]),
+    n?.data?.nativeReceipt && P(n.data.nativeReceipt, ["hash"]),
+    n?.data?.receipt && P(n.data.receipt, ["txHash"]),
+    n?.data?.receipt && P(n.data.receipt, ["transactionHash"]),
+    n?.response && ne(n.response)
+  ];
+  for (const o of r) {
+    const a = _(o);
+    if (a) return a;
+  }
+}
+function te(e) {
+  if (!e || typeof e != "object") return;
+  const t = e;
+  return t.data?.metaTxHash ?? (t.response ? te(t.response) : void 0);
+}
+async function He(e) {
+  const { accountAddress: t, chainId: n, sentAtMs: r, pollingConfig: o } = e, a = o?.apiKey, s = o?.indexerUrl;
+  if (!a || !s) return null;
+  const i = de(n, s);
+  if (!i) return null;
+  const d = new we(i, a), c = D(n), u = Date.now();
+  for (; Date.now() - u < Ee; ) {
+    try {
+      const l = await d.getTransactionHistory({
+        filter: { accountAddress: B(t) },
+        includeMetadata: !1,
+        page: {
+          page: 1,
+          pageSize: 20
+        }
+      });
+      for (const v of l.transactions ?? []) {
+        const y = _(v.txnHash);
+        if (!y) continue;
+        const w = await c.getTransactionReceipt({ hash: y }).catch(() => null);
+        if (!w) continue;
+        const T = await c.getBlock({ blockNumber: w.blockNumber }).catch(() => null), g = T ? Number(T.timestamp) * 1e3 : 0;
+        if (!(g && g < r - 3e4))
+          return {
+            txHash: y,
+            receipt: w
+          };
+      }
+    } catch (l) {
+      k.console.warn("[recover] Failed to poll Sequence indexer for recovery tx hash", { error: l instanceof Error ? l.message : String(l) });
+    }
+    await Ce(Re);
+  }
+  return null;
+}
+async function Se(e) {
+  const { sendResult: t, trailsWalletClient: n, recoverTx: r, sentAtMs: o, pollingConfig: a } = e, s = D(r.chainId), i = ne(t);
+  if (i) return {
+    txHash: i,
+    receipt: await s.waitForTransactionReceipt({ hash: i })
+  };
+  const d = te(t);
+  k.console.warn("[recover] Recovery send returned no transaction hash; polling for mined transaction", { metaTxHash: d });
+  const c = await He({
+    accountAddress: n.account.address,
+    chainId: r.chainId,
+    sentAtMs: o,
+    pollingConfig: a
+  });
+  if (c) return c;
+  throw new Error("Recovery transaction was submitted, but the final transaction hash was not available yet. Please refresh transaction history in a moment.");
+}
+async function re(e) {
+  const { trailsWalletClient: t, recoverTx: n, trailsClient: r, intentId: o, pollingConfig: a, onTransactionSubmitted: s } = e;
   if (!t.account) throw new Error("Wallet client with account is required for recovery");
-  const a = await t.sendTransaction({
+  const i = Date.now(), d = await t.sendTransaction({
     account: t.account,
-    to: r.to,
-    data: r.data,
-    chain: r.chain
-  }), s = await F(r.chainId).waitForTransactionReceipt({ hash: a });
-  if (o && n) try {
-    await te(n, o, r.chainId, a);
-  } catch (i) {
-    q.console.error("[recover] Failed to abort intent after recovery:", {
-      error: i instanceof Error ? i.message : String(i),
+    to: n.to,
+    data: n.data,
+    chain: n.chain
+  });
+  s?.();
+  const { txHash: c, receipt: u } = await Se({
+    sendResult: d,
+    trailsWalletClient: t,
+    recoverTx: n,
+    sentAtMs: i,
+    pollingConfig: a
+  });
+  if (o && r) try {
+    await ce(r, o, n.chainId, c);
+  } catch (l) {
+    k.console.error("[recover] Failed to abort intent after recovery:", {
+      error: l instanceof Error ? l.message : String(l),
       intentId: o,
-      chainId: r.chainId,
-      txHash: a
+      chainId: n.chainId,
+      txHash: c
     });
   }
   return {
-    txHash: a,
-    receipt: s,
-    chainId: r.chainId
+    txHash: c,
+    receipt: u,
+    chainId: n.chainId
   };
 }
-function he(e) {
-  const { selectedIntentAddress: t, refundToAddress: r } = e, n = [], o = t.tokenBalancesData?.tokens ?? [];
+function Be(e) {
+  const { selectedIntentAddress: t, refundToAddress: n } = e, r = [], o = t.tokenBalancesData?.tokens ?? [];
   for (const a of o) {
     const s = a.balance ?? "0", i = BigInt(s);
     if (i <= 0n) continue;
-    const d = a.isNativeToken === !0, l = a.contractAddress;
-    if (!d && !l) {
-      q.console.warn("[recover] Skipping invalid recovery token: missing contractAddress for non-native token", {
+    const d = a.isNativeToken === !0, c = a.contractAddress;
+    if (!d && !c) {
+      k.console.warn("[recover] Skipping invalid recovery token: missing contractAddress for non-native token", {
         symbol: a.symbol || "unknown",
         balance: s,
         chainId: t.chainId,
@@ -265,10 +406,10 @@ function he(e) {
       });
       continue;
     }
-    const c = l || R;
+    const u = c || E;
     if (d) {
-      n.push({
-        to: r,
+      r.push({
+        to: n,
         value: i,
         data: "0x",
         gasLimit: 0n,
@@ -278,12 +419,12 @@ function he(e) {
       });
       continue;
     }
-    let h;
+    let l;
     try {
-      h = f.from(c);
+      l = f.from(u);
     } catch {
-      q.console.warn("[recover] Skipping invalid recovery token: malformed contractAddress", {
-        contractAddress: c,
+      k.console.warn("[recover] Skipping invalid recovery token: malformed contractAddress", {
+        contractAddress: u,
         symbol: a.symbol || "unknown",
         balance: s,
         chainId: t.chainId,
@@ -291,67 +432,62 @@ function he(e) {
       });
       continue;
     }
-    n.push({
-      to: h,
+    r.push({
+      to: l,
       value: 0n,
-      data: ee(r, i),
+      data: se(n, i),
       gasLimit: 0n,
       delegateCall: !1,
       onlyFallback: !1,
       behaviorOnError: "revert"
     });
   }
-  if (n.length === 0) throw new Error("No recoverable token balances found on selected intent");
+  if (r.length === 0) throw new Error("No recoverable token balances found on selected intent");
   return {
     payload: {
       type: "call",
-      space: fe(),
+      space: be(),
       nonce: 0n,
-      calls: n
+      calls: r
     },
-    refundCall: n[0]
+    refundCall: r[0]
   };
 }
-async function ge(e) {
-  const { keyMachineClient: t, selected: r, signerAddress: n, signature: o, payload: a } = e, s = r.intentAddress, i = r.chainId, d = P(i);
+async function Pe(e) {
+  const { keyMachineClient: t, selected: n, signerAddress: r, signature: o, payload: a } = e, s = n.intentAddress, i = n.chainId, d = L(i);
   if (!d) throw new Error(`Chain info not found for chain ID: ${i}`);
-  const l = await le(s, i), c = await t.getDeploy(s);
-  if (!c) throw new Error("Deploy config not found for intent address");
-  const h = await t.getConfiguration(c.imageHash);
-  if (!h) throw new Error("Configuration not found for intent address");
-  const k = ce(o);
-  let u = !1;
-  const p = K.fillLeaves(h.topology, (A) => {
-    if (f.isEqual(f.from(A.address), f.from(n)))
-      return u = !0, {
-        type: "hash",
-        r: BigInt(k.r),
-        s: BigInt(k.s),
-        yParity: k.yParity
-      };
+  const c = await ve(s, i), u = await t.getDeploy(s);
+  if (!u) throw new Error("Deploy config not found for intent address");
+  const l = await t.getConfiguration(u.imageHash);
+  if (!l) throw new Error("Configuration not found for intent address");
+  const v = Ae(o, r);
+  let y = !1;
+  const w = U.fillLeaves(l.topology, (h) => {
+    if (f.isEqual(f.from(h.address), f.from(r)))
+      return y = !0, v;
   });
-  if (!u) throw new Error(`Signer ${n} is not an authorized signer for intent wallet ${s}. Connect the correct wallet to recover.`);
-  const T = K.encodeSignature({
+  if (!y) throw new Error(`Signer ${r} is not an authorized signer for intent wallet ${s}. Connect the correct wallet to recover.`);
+  const T = U.encodeSignature({
     noChainId: !1,
     configuration: {
-      threshold: h.threshold,
-      checkpoint: h.checkpoint,
-      checkpointer: h.checkpointer,
-      topology: p
+      threshold: l.threshold,
+      checkpoint: l.checkpoint,
+      checkpointer: l.checkpointer,
+      topology: w
     }
-  }), v = de.encodeData(G.EXECUTE, [B.toHex(b.encode(a)), B.toHex(T)]);
-  if (!l) {
-    const A = ie.deploy(c.imageHash, c.context), g = G.DefaultGuestAddress;
+  }), g = pe.encodeData(O.EXECUTE, [H.toHex(R.encode(a)), H.toHex(T)]);
+  if (!c) {
+    const h = ye.deploy(u.imageHash, u.context), x = O.DefaultGuestAddress;
     return {
-      to: g,
-      data: B.toHex(b.encode({
+      to: x,
+      data: H.toHex(R.encode({
         type: "call",
         space: 0n,
         nonce: 0n,
         calls: [{
-          to: A.to,
+          to: h.to,
           value: 0n,
-          data: A.data,
+          data: h.data,
           gasLimit: 0n,
           delegateCall: !1,
           onlyFallback: !1,
@@ -359,119 +495,126 @@ async function ge(e) {
         }, {
           to: s,
           value: 0n,
-          data: v,
+          data: g,
           gasLimit: 0n,
           delegateCall: !1,
           onlyFallback: !1,
           behaviorOnError: "revert"
         }]
-      }, g)),
+      }, x)),
       chainId: i,
       chain: d
     };
   }
   return {
     to: s,
-    data: v,
+    data: g,
     chainId: i,
     chain: d
   };
 }
-function We({ intent: e, balancesByIntentAddress: t, walletClient: r, refundToAddress: n, keyMachineClient: o }) {
-  const a = se(), s = o ?? a, i = H(), d = w(() => r ? W(r) : void 0, [r]), l = e?.originIntentAddress ? t[x(e.originIntentAddress)]?.tokenBalancesData : void 0, c = e?.destinationIntentAddress ? t[x(e.destinationIntentAddress)]?.tokenBalancesData : void 0, h = e?.originIntentAddress ? f.from(e.originIntentAddress) : null, k = e?.destinationIntentAddress ? f.from(e.destinationIntentAddress) : null, u = w(() => e ? N(e, l, c, h, k) : null, [
+function tn({ intent: e, balancesByIntentAddress: t, walletClient: n, refundToAddress: r, keyMachineClient: o, onTransactionSubmitted: a }) {
+  const s = ge(), i = o ?? s, d = M(), { sequenceIndexerUrl: c, trailsApiKey: u } = fe(), l = I(() => ({
+    apiKey: u,
+    indexerUrl: c
+  }), [u, c]), v = I(() => n ? G(n) : void 0, [n]), y = e?.originIntentAddress ? t[B(e.originIntentAddress)]?.tokenBalancesData : void 0, w = e?.destinationIntentAddress ? t[B(e.destinationIntentAddress)]?.tokenBalancesData : void 0, T = e?.originIntentAddress ? f.from(e.originIntentAddress) : null, g = e?.destinationIntentAddress ? f.from(e.destinationIntentAddress) : null, h = I(() => e ? j(e, y, w, T, g) : null, [
     e,
-    l,
-    c,
-    h,
-    k
-  ]), p = w(() => L(l, c), [l, c]), T = w(() => _(u), [u]), v = w(() => M(u), [u]), A = w(() => {
-    const y = n || d?.account?.address;
-    return !y || f.isEqual(y, R) ? null : y;
-  }, [n, d?.account?.address]), g = I(async () => {
-    if (!u) throw new Error("No intent address selected for recovery");
-    O(A);
-    const { payload: y, refundCall: S } = he({
-      selectedIntentAddress: u,
-      refundToAddress: A
+    y,
+    w,
+    T,
+    g
+  ]), x = I(() => X(y, w), [y, w]), b = I(() => Y(h), [h]), q = I(() => Z(h), [h]), S = I(() => {
+    const p = r || v?.account?.address;
+    return !p || f.isEqual(p, E) ? null : p;
+  }, [r, v?.account?.address]), C = A(async () => {
+    if (!h) throw new Error("No intent address selected for recovery");
+    J(S);
+    const { payload: p, refundCall: N } = Be({
+      selectedIntentAddress: h,
+      refundToAddress: S
     });
     return {
-      payload: y,
-      refundCall: S,
-      chainId: u.chainId,
-      typedData: b.toTyped(u.intentAddress, u.chainId, y)
+      payload: p,
+      refundCall: N,
+      chainId: h.chainId,
+      typedData: R.toTyped(h.intentAddress, h.chainId, p)
     };
-  }, [u, A]), m = I(async (y) => {
-    if (!d?.account) throw new Error("Wallet client with account is required for recovery");
-    return U({
-      walletClient: d,
-      prepared: y ?? await g()
+  }, [h, S]), m = A(async (p) => {
+    if (!v?.account) throw new Error("Wallet client with account is required for recovery");
+    return ee({
+      walletClient: v,
+      prepared: p ?? await C()
     });
-  }, [d, g]), C = I(async (y) => {
-    if (!u) throw new Error("No intent address selected for recovery");
-    return ge({
-      keyMachineClient: s,
-      selected: u,
-      signerAddress: y.signerAddress,
-      signature: y.signature,
-      payload: y.payload
+  }, [v, C]), F = A(async (p) => {
+    if (!h) throw new Error("No intent address selected for recovery");
+    return Pe({
+      keyMachineClient: i,
+      selected: h,
+      signerAddress: p.signerAddress,
+      signature: p.signature,
+      payload: p.payload
     });
-  }, [u, s]);
+  }, [h, i]);
   return {
     intent: e,
-    hasIntentBalance: p,
-    recoverToken: T,
-    selectedRecoveryTarget: v,
+    hasIntentBalance: x,
+    recoverToken: b,
+    selectedRecoveryTarget: q,
     signPayload: m,
-    getDataToSign: g,
-    getRecoverTx: C,
-    recover: I(async () => {
-      if (!d?.account) throw new Error("Wallet client with account is required for recovery");
-      const { signature: y, signerAddress: S, payload: E } = await m(await g());
-      return D({
-        trailsWalletClient: d,
-        recoverTx: await C({
-          signature: y,
-          signerAddress: S,
-          payload: E
+    getDataToSign: C,
+    getRecoverTx: F,
+    recover: A(async () => {
+      if (!v?.account) throw new Error("Wallet client with account is required for recovery");
+      const { signature: p, signerAddress: N, payload: oe } = await m(await C());
+      return re({
+        trailsWalletClient: v,
+        recoverTx: await F({
+          signature: p,
+          signerAddress: N,
+          payload: oe
         }),
-        trailsClient: i,
-        intentId: e?.intentId
+        trailsClient: d,
+        intentId: e?.intentId,
+        pollingConfig: l,
+        onTransactionSubmitted: a
       });
     }, [
-      d,
-      g,
-      m,
+      v,
       C,
-      i,
-      e?.intentId
+      m,
+      F,
+      d,
+      e?.intentId,
+      l,
+      a
     ]),
-    getRecoverStatus: I((y) => z(y), [])
+    getRecoverStatus: A((p) => Q(p), [])
   };
 }
-function Ne({ intentId: e, walletClient: t, refundToAddress: r }) {
-  const n = H(), o = w(() => t ? W(t) : void 0, [t]), a = o?.account?.address, s = ye({
+function rn({ intentId: e, walletClient: t, refundToAddress: n }) {
+  const r = M(), o = I(() => t ? G(t) : void 0, [t]), a = o?.account?.address, s = De({
     intentId: e,
     walletAddress: a,
-    refundToAddress: r || a
-  }), i = I(async () => {
+    refundToAddress: n || a
+  }), i = A(async () => {
     if (!o?.account) throw new Error("Intent data and wallet client with account required");
-    return U({
+    return ee({
       walletClient: o,
       prepared: await s.getDataToSign()
     });
-  }, [o, s]), d = I(async (c) => s.getRecoverTx({
-    signature: c.signedHash,
-    payload: c.payload
-  }), [s]), l = I(async () => {
+  }, [o, s]), d = A(async (u) => s.getRecoverTx({
+    signature: u.signedHash,
+    payload: u.payload
+  }), [s]), c = A(async () => {
     if (!o?.account) throw new Error("Intent data and wallet client with account required");
-    const { signature: c, payload: h } = await i();
-    return D({
+    const { signature: u, payload: l } = await i();
+    return re({
       trailsWalletClient: o,
       recoverTx: await d({
-        signedHash: c,
-        payload: h
+        signedHash: u,
+        payload: l
       }),
-      trailsClient: n,
+      trailsClient: r,
       intentId: e
     });
   }, [
@@ -479,159 +622,82 @@ function Ne({ intentId: e, walletClient: t, refundToAddress: r }) {
     d,
     o,
     e,
-    n
+    r
   ]);
   return {
     ...s,
     signPayload: i,
     getRecoverTx: d,
-    recover: l
+    recover: c
   };
 }
-function ye({ intentId: e, walletAddress: t, refundToAddress: r }) {
-  const { intent: n, isLoading: o, error: a, refetch: s } = ae({
+function De({ intentId: e, walletAddress: t, refundToAddress: n }) {
+  const { intent: r, isLoading: o, error: a, refetch: s } = he({
     intentId: e,
     enabled: !!e
-  }), i = H(), d = n?.originIntentAddress ? f.from(n.originIntentAddress) : null, l = n?.destinationIntentAddress ? f.from(n.destinationIntentAddress) : null, { balancesByAccount: c, isLoading: h, error: k } = oe([d, l], { refetchInterval: re }), u = d ? c[x(d)]?.tokenBalancesData : void 0, p = l ? c[x(l)]?.tokenBalancesData : void 0, T = k, v = w(() => n ? N(n, u, p, d, l) : null, [
-    n,
-    u,
-    p,
+  }), i = M(), d = r?.originIntentAddress ? f.from(r.originIntentAddress) : null, c = r?.destinationIntentAddress ? f.from(r.destinationIntentAddress) : null, { balancesByAccount: u, isLoading: l, error: v } = ue([d, c], { refetchInterval: le }), y = d ? u[B(d)]?.tokenBalancesData : void 0, w = c ? u[B(c)]?.tokenBalancesData : void 0, T = v, g = I(() => r ? j(r, y, w, d, c) : null, [
+    r,
+    y,
+    w,
     d,
-    l
-  ]), A = w(() => L(u, p), [u, p]), g = w(() => _(v), [v]), m = w(() => {
-    const E = r ?? t;
-    return !E || f.isEqual(E, R) ? null : E;
-  }, [r, t]), C = I(async () => {
-    if (!n) throw new Error("Intent data required");
-    if (!m) throw new Error("Refund address required. Provide refundToAddress or walletAddress");
-    if (f.isEqual(m, R)) throw new Error("Refund address cannot be zero address");
-    if (!v) throw new Error("No intent address selected for recovery");
-    return Y({
+    c
+  ]), h = I(() => X(y, w), [y, w]), x = I(() => Y(g), [g]), b = I(() => {
+    const m = n ?? t;
+    return !m || f.isEqual(m, E) ? null : m;
+  }, [n, t]), q = A(async () => {
+    if (!r) throw new Error("Intent data required");
+    if (!b) throw new Error("Refund address required. Provide refundToAddress or walletAddress");
+    if (f.isEqual(b, E)) throw new Error("Refund address cannot be zero address");
+    if (!g) throw new Error("No intent address selected for recovery");
+    return ke({
       trailsClient: i,
-      intentData: n,
-      selectedIntentAddress: v,
-      effectiveRefundAddress: m
+      intentData: r,
+      selectedIntentAddress: g,
+      effectiveRefundAddress: b
     });
   }, [
-    n,
-    v,
-    m,
+    r,
+    g,
+    b,
     i
-  ]), y = I(async (E) => {
-    if (!n) throw new Error("Intent data required");
-    if (!v) throw new Error("No intent address selected for recovery");
-    return Q({
+  ]), S = A(async (m) => {
+    if (!r) throw new Error("Intent data required");
+    if (!g) throw new Error("No intent address selected for recovery");
+    return Te({
       trailsClient: i,
-      intentData: n,
-      selected: v,
-      effectiveRefundAddress: m,
-      signature: E.signature,
-      payload: E.payload
+      intentData: r,
+      selected: g,
+      effectiveRefundAddress: b,
+      signature: m.signature,
+      payload: m.payload
     });
   }, [
-    n,
-    v,
-    m,
+    r,
+    g,
+    b,
     i
-  ]), S = I((E) => z(E), []);
+  ]), C = A((m) => Q(m), []);
   return {
-    intent: n,
+    intent: r,
     isLoadingIntent: o,
-    isLoadingBalances: h,
+    isLoadingBalances: l,
     intentError: a,
     balancesError: T,
-    hasIntentBalance: A,
-    recoverToken: g,
-    selectedRecoveryTarget: w(() => M(v), [v]),
-    refetchIntent: s,
-    getDataToSign: C,
-    getRecoverTx: y,
-    getRecoverStatus: S
-  };
-}
-function Le({ intent: e, balancesByIntentAddress: t, walletClient: r, refundToAddress: n }) {
-  const o = H(), a = w(() => r ? W(r) : void 0, [r]), s = e?.originIntentAddress ? t[x(e.originIntentAddress)]?.tokenBalancesData : void 0, i = e?.destinationIntentAddress ? t[x(e.destinationIntentAddress)]?.tokenBalancesData : void 0, d = e?.originIntentAddress ? f.from(e.originIntentAddress) : null, l = e?.destinationIntentAddress ? f.from(e.destinationIntentAddress) : null, c = w(() => e ? N(e, s, i, d, l) : null, [
-    e,
-    s,
-    i,
-    d,
-    l
-  ]), h = w(() => L(s, i), [s, i]), k = w(() => _(c), [c]), u = w(() => {
-    const g = n || a?.account?.address;
-    return !g || f.isEqual(g, R) ? null : g;
-  }, [n, a?.account?.address]), p = I(async () => {
-    if (!e || !a?.account) throw new Error("Intent data and wallet client with account required");
-    if (O(u), !c) throw new Error("No intent address selected for recovery");
-    return U({
-      walletClient: a,
-      prepared: await Y({
-        trailsClient: o,
-        intentData: e,
-        selectedIntentAddress: c,
-        effectiveRefundAddress: u
-      })
-    });
-  }, [
-    e,
-    a,
-    c,
-    u,
-    o
-  ]), T = I(async (g) => {
-    if (!e) throw new Error("Intent data required");
-    if (!c) throw new Error("No intent address selected for recovery");
-    return Q({
-      trailsClient: o,
-      intentData: e,
-      selected: c,
-      effectiveRefundAddress: u,
-      signature: g.signedHash,
-      payload: g.payload
-    });
-  }, [
-    e,
-    c,
-    u,
-    o
-  ]), v = I(async () => {
-    if (!a?.account) throw new Error("Wallet client with account is required for recovery");
-    if (!e) throw new Error("Intent data is required for recovery");
-    const { signature: g, payload: m } = await p(), { txHash: C } = await D({
-      trailsWalletClient: a,
-      recoverTx: await T({
-        signedHash: g,
-        payload: m
-      }),
-      trailsClient: o,
-      intentId: e.intentId
-    });
-    return { txHash: C };
-  }, [
-    a,
-    e,
-    p,
-    T,
-    o
-  ]), A = I((g) => z(g), []);
-  return {
-    intent: e,
     hasIntentBalance: h,
-    recoverToken: k,
-    selectedRecoveryTarget: w(() => M(c), [c]),
-    refetchIntent: () => {
-    },
-    signPayload: p,
-    getRecoverTx: T,
-    recover: v,
-    getRecoverStatus: A
+    recoverToken: x,
+    selectedRecoveryTarget: I(() => Z(g), [g]),
+    refetchIntent: s,
+    getDataToSign: q,
+    getRecoverTx: S,
+    getRecoverStatus: C
   };
 }
 export {
-  Fe as buildRefundTransactionWithSignature,
-  le as isAddressDeployed,
-  Pe as signPayload,
-  Ne as useIntentRecover,
-  ye as useIntentRecoverWithAddress,
-  Le as useIntentRecoverWithBalances,
-  We as useKeymachineIntentRecovery
+  nn as buildRefundTransactionWithSignature,
+  ve as isAddressDeployed,
+  Ae as recoverySignatureForSigner,
+  en as signPayload,
+  rn as useIntentRecover,
+  De as useIntentRecoverWithAddress,
+  tn as useKeymachineIntentRecovery
 };