@towns-labs/relayer 2.0.13 → 2.1.1

package/dist/README.md

@@ -1 +1 @@
-This folder contains the built output assets for the worker "relayer-worker" generated at 2026-02-12T00:44:04.759Z.
+This folder contains the built output assets for the worker "relayer-worker" generated at 2026-02-16T21:41:19.331Z.

package/dist/index.js

@@ -23663,6 +23663,7 @@ var ACCOUNT_NOT_DELEGATED = -32009;
 var QUOTE_EXPIRED = -32010;
 var INVALID_QUOTE_SIGNATURE = -32011;
 var PAYMENT_EXCEEDS_MAX = -32012;
+var DRAFT_CONFLICT = -32013;
 var ERROR_MESSAGES = {
   [PARSE_ERROR]: "Parse error",
   [INVALID_REQUEST]: "Invalid Request",
@@ -23681,7 +23682,8 @@ var ERROR_MESSAGES = {
   [ACCOUNT_NOT_DELEGATED]: "Account not delegated",
   [QUOTE_EXPIRED]: "Quote expired",
   [INVALID_QUOTE_SIGNATURE]: "Invalid quote signature",
-  [PAYMENT_EXCEEDS_MAX]: "Payment amount exceeds maximum"
+  [PAYMENT_EXCEEDS_MAX]: "Payment amount exceeds maximum",
+  [DRAFT_CONFLICT]: "Draft conflict"
 };
 var RpcError2 = class extends Error {
   static {
@@ -23801,7 +23803,7 @@ function isEip7702Delegated(code) {
 }
 __name(isEip7702Delegated, "isEip7702Delegated");
 
-// src/services/relayer.ts
+// src/rpc/schema/intentTypes.ts
 var INTENT_TYPES = {
   Intent: [
     { name: "multichain", type: "bool" },
@@ -23823,60 +23825,39 @@ var INTENT_TYPES = {
     { name: "data", type: "bytes" }
   ]
 };
+
+// src/services/relayer.ts
 function createIntentNonceProvider(durableObject, chainId) {
   const durableObjectNameFor = /* @__PURE__ */ __name((eoa) => `${chainId}:${eoa.toLowerCase()}`, "durableObjectNameFor");
+  const getStubForEoa = /* @__PURE__ */ __name((eoa) => {
+    const id = durableObject.idFromName(durableObjectNameFor(eoa));
+    return durableObject.get(id);
+  }, "getStubForEoa");
+  const postToNonceDo = /* @__PURE__ */ __name(async (eoa, path, body) => {
+    const stub = getStubForEoa(eoa);
+    return stub.fetch(
+      new Request(`http://do/${path}`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body)
+      })
+    );
+  }, "postToNonceDo");
   return {
-    async acquireNonce(eoa, seqKey = 0n) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/acquire", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ seqKey: seqKey.toString() })
-        })
-      );
-      if (!response.ok) {
-        const error48 = await response.json();
-        throw new Error(`Failed to acquire intent nonce: ${error48.error}`);
-      }
-      const data = await response.json();
-      return BigInt(data.nonce);
-    },
-    async acquireNonceSynced(eoa, seqKey, onChainSeq) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/acquire_synced", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            seqKey: seqKey.toString(),
-            onChainSeq: onChainSeq.toString()
-          })
-        })
-      );
-      if (!response.ok) {
-        const error48 = await response.json();
-        throw new Error(`Failed to acquire synced intent nonce: ${error48.error}`);
-      }
-      const data = await response.json();
-      return { nonce: BigInt(data.nonce), synced: data.synced };
-    },
     async acquireOrGetDraft(eoa, seqKey, onChainSeq, prepareKey) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/acquire_or_get_draft", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            seqKey: seqKey.toString(),
-            onChainSeq: onChainSeq.toString(),
-            draftKey: prepareKey
-          })
-        })
-      );
+      const response = await postToNonceDo(eoa, "acquire_or_get_draft", {
+        seqKey: seqKey.toString(),
+        onChainSeq: onChainSeq.toString(),
+        draftKey: prepareKey
+      });
+      if (response.status === 409) {
+        const body = await response.json();
+        return {
+          conflict: true,
+          error: body.error,
+          conflictDraftId: body.conflictDraftId
+        };
+      }
       if (!response.ok) {
         const error48 = await response.json();
         throw new Error(`Failed to acquire intent draft: ${error48.error}`);
@@ -23891,55 +23872,16 @@ function createIntentNonceProvider(durableObject, chainId) {
       };
     },
     async markSubmitted(eoa, seqKey, draftId) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/mark_submitted", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ seqKey: seqKey.toString(), draftId })
-        })
-      );
+      const response = await postToNonceDo(eoa, "mark_submitted", {
+        seqKey: seqKey.toString(),
+        draftId
+      });
       if (!response.ok) {
         const error48 = await response.json();
         throw new Error(`Failed to mark intent draft submitted: ${error48.error}`);
       }
       const data = await response.json();
       return data.status;
-    },
-    async cancelDraft(eoa, seqKey, draftId) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/cancel_draft", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ seqKey: seqKey.toString(), draftId })
-        })
-      );
-      if (!response.ok) {
-        const error48 = await response.json();
-        throw new Error(`Failed to cancel intent draft: ${error48.error}`);
-      }
-      const data = await response.json();
-      return data.status;
-    },
-    async syncNonce(eoa, seqKey, confirmedSeq) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/sync", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            seqKey: seqKey.toString(),
-            confirmedSeq: confirmedSeq.toString()
-          })
-        })
-      );
-      if (!response.ok) {
-        console.warn("Failed to sync intent nonce for:", eoa);
-      }
     }
   };
 }
@@ -23953,6 +23895,26 @@ var DEFAULT_GAS_CONFIG = {
   txGasBuffer: 0n,
   allowSimulationFallback: false
 };
+var DEFAULT_INTENT_EXPIRY_SECONDS = 3600n;
+var MAX_INTENT_EXPIRY_SECONDS_FROM_NOW = 365n * 24n * 60n * 60n;
+var MILLISECONDS_EPOCH_THRESHOLD = 1000000000000n;
+function resolveIntentExpirySeconds(rawExpiry, nowSeconds = BigInt(Math.floor(Date.now() / 1e3))) {
+  if (!rawExpiry) {
+    return nowSeconds + DEFAULT_INTENT_EXPIRY_SECONDS;
+  }
+  const expiry = BigInt(rawExpiry);
+  const maxSupportedExpiry = nowSeconds + MAX_INTENT_EXPIRY_SECONDS_FROM_NOW;
+  if (expiry > maxSupportedExpiry) {
+    if (expiry >= MILLISECONDS_EPOCH_THRESHOLD) {
+      throw new Error(
+        `Invalid expiry: ${rawExpiry} appears to be milliseconds; use unix seconds`
+      );
+    }
+    throw new Error(`Invalid expiry: ${rawExpiry} is too far in the future`);
+  }
+  return expiry;
+}
+__name(resolveIntentExpirySeconds, "resolveIntentExpirySeconds");
 function isPaymentEnabled(payer, paymentToken) {
   return payer !== zeroAddress && paymentToken !== zeroAddress;
 }
@@ -23961,6 +23923,14 @@ function calculateCombinedGas(simulationGas, gasConfig, paymentEnabled) {
   return simulationGas + gasConfig.intentGasBuffer + (paymentEnabled ? gasConfig.paymentGasBuffer : 0n);
 }
 __name(calculateCombinedGas, "calculateCombinedGas");
+function normalizeCalls(calls) {
+  return calls.map((call2) => ({
+    to: call2.to,
+    value: call2.value ? BigInt(call2.value) : 0n,
+    data: call2.data ?? "0x"
+  }));
+}
+__name(normalizeCalls, "normalizeCalls");
 function extractRevertData(error48) {
   if (error48 instanceof BaseError2) {
     const rawError = error48.walk((e) => e instanceof RawContractError);
@@ -24047,12 +24017,20 @@ var RelayerService = class {
   async acquireNonceFromProvider(eoa, seqKey, prepareKey) {
     const onChainSeq = await this.fetchOnChainSeq(eoa, seqKey);
     const safeOnChainSeq = onChainSeq ?? 0n;
-    const { nonce, draftId, expiresAtMs, fromCache } = await this.intentNonceProvider.acquireOrGetDraft(
+    const result = await this.intentNonceProvider.acquireOrGetDraft(
       eoa,
       seqKey,
       safeOnChainSeq,
       prepareKey
     );
+    if ("conflict" in result) {
+      return {
+        success: false,
+        error: result.error,
+        conflictDraftId: result.conflictDraftId
+      };
+    }
+    const { nonce, draftId, expiresAtMs, fromCache } = result;
     if (onChainSeq === null) {
       this.logger.debug(
         { eoa, nonce: nonce.toString(), draftId },
@@ -24119,11 +24097,7 @@ var RelayerService = class {
           errorCode: "DELEGATION_PENDING"
         };
       }
-      const calls = request.calls.map((c2) => ({
-        to: c2.to,
-        value: c2.value ? BigInt(c2.value) : 0n,
-        data: c2.data ?? "0x"
-      }));
+      const calls = normalizeCalls(request.calls);
       const executionData = encodeAbiParameters(
         [
           {
@@ -24137,6 +24111,19 @@ var RelayerService = class {
         ],
         [calls]
       );
+      const nowSeconds = BigInt(Math.floor(Date.now() / 1e3));
+      const expiry = resolveIntentExpirySeconds(request.expiry, nowSeconds);
+      let signature = request.signature ?? "0x";
+      if (request.sessionKey && !request.signature) {
+        const keyHash = keccak256(
+          encodeAbiParameters(parseAbiParameters("uint8, bytes32"), [
+            0,
+            // secp256k1
+            keccak256(request.sessionKey)
+          ])
+        );
+        signature = concat([`0x${"00".repeat(65)}`, keyHash, "0x00"]);
+      }
       const intent = {
         eoa: request.eoa,
         executionData,
@@ -24149,14 +24136,14 @@ var RelayerService = class {
         encodedPreCalls: request.encodedPreCalls ?? [],
         encodedFundTransfers: request.encodedFundTransfers ?? [],
         settler: request.settler ?? zeroAddress,
-        expiry: BigInt(request.expiry ?? Math.floor(Date.now() / 1e3) + 3600),
+        expiry,
         isMultichain: request.isMultichain ?? false,
         funder: request.funder ?? zeroAddress,
         funderSignature: request.funderSignature ?? "0x",
         settlerContext: request.settlerContext ?? "0x",
         paymentAmount: BigInt(request.paymentAmount ?? "0"),
         paymentRecipient: request.paymentRecipient ?? zeroAddress,
-        signature: request.signature ?? "0x",
+        signature,
         paymentSignature: request.paymentSignature ?? "0x",
         supportedAccountImplementation: request.supportedAccountImplementation ?? zeroAddress
       };
@@ -24270,10 +24257,15 @@ var RelayerService = class {
         request.prepareKey
       );
       if (!nonceResult.success) {
-        return { success: false, error: nonceResult.error };
+        return {
+          success: false,
+          error: nonceResult.error,
+          conflictDraftId: nonceResult.conflictDraftId
+        };
       }
       const nonce = nonceResult.nonce;
-      const expiry = request.expiry ? BigInt(request.expiry) : BigInt(Math.floor(Date.now() / 1e3) + 3600);
+      const nowSeconds = BigInt(Math.floor(Date.now() / 1e3));
+      const expiry = resolveIntentExpirySeconds(request.expiry, nowSeconds);
       const encodedPreCalls = request.encodedPreCalls ?? [];
       const encodedFundTransfers = request.encodedFundTransfers ?? [];
       const settler = request.settler ?? zeroAddress;
@@ -24281,11 +24273,7 @@ var RelayerService = class {
       const paymentToken = request.paymentToken ?? zeroAddress;
       const paymentMaxAmount = BigInt(request.paymentMaxAmount ?? "0");
       const paymentEnabled = isPaymentEnabled(payer, paymentToken);
-      const calls = request.calls.map((c2) => ({
-        to: c2.to,
-        value: c2.value ? BigInt(c2.value) : 0n,
-        data: c2.data ?? "0x"
-      }));
+      const calls = normalizeCalls(request.calls);
       const simulateResult = await this.simulateIntent({
         eoa: request.eoa,
         calls: request.calls,
@@ -24296,7 +24284,8 @@ var RelayerService = class {
         settler: request.settler,
         payer: request.payer,
         paymentToken: request.paymentToken,
-        paymentMaxAmount: request.paymentMaxAmount
+        paymentMaxAmount: request.paymentMaxAmount,
+        sessionKey: request.sessionKey
       });
       const simulationGas = simulateResult.gasUsed ? BigInt(simulateResult.gasUsed) : 0n;
       const simulationSucceeded = simulateResult.success && simulationGas > 0n;
@@ -24557,30 +24546,9 @@ function hashQuotes(signedQuotes, config2) {
       settler: quote.intent.settler ?? zeroAddress,
       expiry: BigInt(quote.intent.expiry || "0")
     };
-    const INTENT_TYPES_FOR_HASH = {
-      Intent: [
-        { name: "multichain", type: "bool" },
-        { name: "eoa", type: "address" },
-        { name: "calls", type: "Call[]" },
-        { name: "nonce", type: "uint256" },
-        { name: "payer", type: "address" },
-        { name: "paymentToken", type: "address" },
-        { name: "paymentMaxAmount", type: "uint256" },
-        { name: "combinedGas", type: "uint256" },
-        { name: "encodedPreCalls", type: "bytes[]" },
-        { name: "encodedFundTransfers", type: "bytes[]" },
-        { name: "settler", type: "address" },
-        { name: "expiry", type: "uint256" }
-      ],
-      Call: [
-        { name: "to", type: "address" },
-        { name: "value", type: "uint256" },
-        { name: "data", type: "bytes" }
-      ]
-    };
     const intentDigest = hashTypedData({
       domain: domain2,
-      types: INTENT_TYPES_FOR_HASH,
+      types: INTENT_TYPES,
       primaryType: "Intent",
       message: intentMessage
     });
@@ -24637,7 +24605,7 @@ function extractIntentFromContext(context) {
 __name(extractIntentFromContext, "extractIntentFromContext");
 async function validateQuote(signedQuotes, env) {
   const currentTime = Math.floor(Date.now() / 1e3);
-  if (typeof signedQuotes.ttl !== "number" || signedQuotes.ttl < currentTime) {
+  if (typeof signedQuotes.ttl !== "number" || signedQuotes.ttl <= currentTime) {
     return new RpcError2(
       QUOTE_EXPIRED,
       `Quote expired at ${signedQuotes.ttl}, current time is ${currentTime}`
@@ -40053,6 +40021,7 @@ async function handlePrepareCalls(params, ctx) {
   const nonce = meta3?.nonce;
   const seqKey = meta3?.seq_key;
   const prepareKey = meta3?.prepare_key;
+  const expiry = meta3?.expiry;
   const payer = meta3?.fee_payer;
   const paymentToken = meta3?.fee_token;
   const paymentMaxAmount = meta3?.fee_max_amount;
@@ -40071,13 +40040,27 @@ async function handlePrepareCalls(params, ctx) {
     calls: normalizedCalls,
     nonce,
     seqKey,
+    expiry,
     settler,
     payer,
     paymentToken,
     paymentMaxAmount,
-    prepareKey
+    prepareKey,
+    sessionKey: typedParams.session_key
   });
   if (!result.success || !result.typedData || !result.digest) {
+    if (result.conflictDraftId) {
+      throw new RpcError2(DRAFT_CONFLICT, result.error ?? "Draft conflict", {
+        conflictDraftId: result.conflictDraftId
+      });
+    }
+    const rawError = result.error ?? "Failed to prepare calls";
+    if (rawError.toLowerCase().startsWith("simulation failed")) {
+      const cause = rawError.replace(/^simulation failed:\s*/i, "").trim();
+      throw new RpcError2(SIMULATION_FAILED, "Simulation failed", {
+        cause: cause.length > 0 ? cause : void 0
+      });
+    }
     throw new RpcError2(INTERNAL_ERROR, result.error ?? "Failed to prepare calls");
   }
   const feeConfig = getFeeConfig(env);
@@ -40212,14 +40195,6 @@ async function handlePrepareCalls(params, ctx) {
       message[key] = value;
     }
   }
-  let callKey;
-  if (typedParams.key) {
-    callKey = {
-      type: typedParams.key.type,
-      publicKey: typedParams.key.public_key,
-      prehash: typedParams.key.prehash ?? false
-    };
-  }
   return {
     context: preparedContext,
     digest: result.digest,
@@ -40235,7 +40210,6 @@ async function handlePrepareCalls(params, ctx) {
       feeTotals: {},
       assetDiffs: {}
     },
-    key: callKey,
     signature: signedQuotes.signature
   };
 }
@@ -45439,11 +45413,17 @@ __name(isPendingTransactionIdUniqueConstraintError, "isPendingTransactionIdUniqu
 
 // src/durable-objects/signer.do.ts
 var DEFAULT_MAX_PENDING = 16;
-var BALANCE_CHECK_INTERVAL_MS = 6e4;
+var BALANCE_CHECK_INTERVAL_MS = 3e5;
 var STALE_TX_THRESHOLD_MS = 5 * 60 * 1e3;
 var DEFAULT_INTENT_EXPIRY_BUFFER_SECONDS = 30;
 var DUPLICATE_TX_WAIT_MS = 2e3;
 var DUPLICATE_TX_WAIT_POLL_MS = 100;
+function mapStoredTxStatusToPublicStatus(storedStatus) {
+  if (storedStatus === "confirmed") return "confirmed";
+  if (storedStatus === "failed" || storedStatus === "stuck") return "failed";
+  return "pending";
+}
+__name(mapStoredTxStatusToPublicStatus, "mapStoredTxStatusToPublicStatus");
 function isIntentExpired(expiryTimestamp, bufferSeconds = DEFAULT_INTENT_EXPIRY_BUFFER_SECONDS) {
   const expiry = typeof expiryTimestamp === "string" ? BigInt(expiryTimestamp) : expiryTimestamp;
   const currentTime = BigInt(Math.floor(Date.now() / 1e3));
@@ -45878,11 +45858,12 @@ var SignerDO = class extends DurableObject {
       }
     } catch {
     }
+    const fallbackStatus = mapStoredTxStatusToPublicStatus(status);
     return {
       txId,
       txHash,
       chainId,
-      status: "pending",
+      status: fallbackStatus,
       submittedAt: sentAt
     };
   }
@@ -45954,7 +45935,7 @@ var SignerDO = class extends DurableObject {
     await this.ensureInitialized();
     const rows = this.sql.exec(
       `
-      SELECT address, paused, last_balance_check, balance_wei
+      SELECT address, chain_id, paused, last_balance_check, balance_wei
       FROM signer_state WHERE id = 1
     `
     ).toArray();
@@ -47754,6 +47735,15 @@ var IntentNonceDO = class extends DurableObject4 {
             draftKey,
             draftTtlMs: coerceDraftTtlMs(draftTtlMs)
           });
+          if ("error" in result) {
+            return Response.json(
+              {
+                error: result.error,
+                conflictDraftId: result.conflictDraftId
+              },
+              { status: 409 }
+            );
+          }
           return Response.json({
             nonce: result.nonce.toString(),
             draftId: result.draftId,
@@ -47935,6 +47925,14 @@ var IntentNonceDO = class extends DurableObject4 {
       this.deleteExpiredDraftForSeqKey(key, nowMs);
       const existingDraft = this.getDraftForSeqKey(key);
       if (existingDraft !== null) {
+        const incomingDraftKey = options.draftKey ?? null;
+        const existingDraftKey = existingDraft.draft_key;
+        if (incomingDraftKey !== existingDraftKey) {
+          return {
+            error: "draft already exists for seqKey with a different draftKey; complete or cancel the active request first",
+            conflictDraftId: existingDraft.draft_id
+          };
+        }
         return {
           nonce: BigInt(existingDraft.nonce),
           draftId: existingDraft.draft_id,