@atumlabs/mppx-atum-escrow 0.2.2 → 0.3.0

package/dist/{chunk-4P34CLTO.js → chunk-Z3AUNEU5.js}

@@ -496,12 +496,14 @@ var require_utils = __commonJS({
   "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/utils.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.SOLANA_REPLAY_SLOTS = exports.PERMIT_NONCE_DOMAIN = exports.REPLAY_HORIZON_SECS = void 0;
+    exports.REQUEST_ID_DOMAIN = exports.SOLANA_REPLAY_SLOTS = exports.PERMIT_NONCE_DOMAIN = exports.REPLAY_HORIZON_SECS = void 0;
     exports.resolvePermitDeadline = resolvePermitDeadline;
     exports.generatePermitNonce = generatePermitNonce;
     exports.resolvePermitNonce = resolvePermitNonce;
+    exports.canonicalDepositor = canonicalDepositor;
     exports.deterministicPermitNonce = deterministicPermitNonce;
     exports.deterministicSolanaNonce = deterministicSolanaNonce;
+    exports.deterministicRequestId = deterministicRequestId2;
     exports.sameAddress = sameAddress2;
     exports.assertKeyMatchesSender = assertKeyMatchesSender;
     exports.assertToken = assertToken;
@@ -546,6 +548,20 @@ var require_utils = __commonJS({
       const bucket = (seed >> 8n) % (1n << SOLANA_BUCKET_BITS);
       return bucket << 32n | slot;
     }
+    exports.REQUEST_ID_DOMAIN = "atum-request:v1:";
+    function deterministicRequestId2(params) {
+      if (!params.anchor) {
+        throw new Error("sender_auth: a per-intent anchor is required to derive a deterministic request_id (a random one would silently break idempotency and let a retry double-charge)");
+      }
+      if (!params.account) {
+        throw new Error("sender_auth: account is required to derive a deterministic request_id");
+      }
+      if (!/^[A-Za-z0-9_-]*$/.test(params.prefix)) {
+        throw new Error(`sender_auth: request_id prefix must contain only letters, digits, '_' or '-' (got ${JSON.stringify(params.prefix)})`);
+      }
+      const digest = (0, ethers_1.keccak256)((0, ethers_1.toUtf8Bytes)(`${exports.REQUEST_ID_DOMAIN}${params.anchor}:${canonicalDepositor(params.account)}`));
+      return `${params.prefix}${digest.slice(2, 26)}`;
+    }
     function sameAddress2(a, b) {
       if (a.startsWith("0x") && b.startsWith("0x")) {
         return a.toLowerCase() === b.toLowerCase();
@@ -693,7 +709,7 @@ var require_evm = __commonJS({
     exports.evmAdapter = {
       async buildAuthMessage({ sourceAsset, maxSourceAmount, sourceDefaults, deadline, nonce }) {
         if (nonce === void 0) {
-          throw new Error("sender_auth: buildAuthMessage requires an explicit nonce \u2014 derive it deterministically from a stable request id (e.g. the challenge id) so retries reproduce the same permit; pass generatePermitNonce() only for genuinely one-shot builds");
+          throw new Error("sender_auth: buildAuthMessage requires an explicit nonce \u2014 derive it deterministically from a stable request id (e.g. an order id) so retries reproduce the same permit; pass generatePermitNonce() only for genuinely one-shot builds");
         }
         if (deadline === void 0) {
           throw new Error("sender_auth: buildAuthMessage requires an explicit permit deadline (absolute Unix seconds) \u2014 the low-level builder does not default it; derive it from the payment's fulfillment/settlement deadline in the calling layer (pgc/mppx)");
@@ -721,6 +737,10 @@ var require_evm = __commonJS({
           throw new Error("EVM adapter sign(): signed_messages[i].message_prehash is required");
         }
         const prehash = JSON.parse(signedMessage.message_prehash);
+        const prehashDigest = (0, evm_escrow_encoding_1.hashPermitWitnessTransferFrom)(prehash);
+        if (prehashDigest.toLowerCase() !== signedMessage.message.toLowerCase()) {
+          throw new Error(`EVM adapter sign(): message_prehash implies digest ${prehashDigest} but message is ${signedMessage.message}`);
+        }
         const wallet = new ethers_1.Wallet(privateKey);
         return wallet.signTypedData(prehash.domain, prehash.types, prehash.message);
       },
@@ -1011,7 +1031,7 @@ var require_tron = __commonJS({
     exports.tronAdapter = {
       async buildAuthMessage({ sourceAsset, maxSourceAmount, sourceDefaults, deadline, nonce }) {
         if (nonce === void 0) {
-          throw new Error("sender_auth: buildAuthMessage requires an explicit nonce \u2014 derive it deterministically from a stable request id (e.g. the challenge id) so retries reproduce the same permit; pass generatePermitNonce() only for genuinely one-shot builds");
+          throw new Error("sender_auth: buildAuthMessage requires an explicit nonce \u2014 derive it deterministically from a stable request id (e.g. an order id) so retries reproduce the same permit; pass generatePermitNonce() only for genuinely one-shot builds");
         }
         if (deadline === void 0) {
           throw new Error("sender_auth: buildAuthMessage requires an explicit permit deadline (absolute Unix seconds) \u2014 the low-level builder does not default it; derive it from the payment's fulfillment/settlement deadline in the calling layer (pgc/mppx)");
@@ -1034,9 +1054,19 @@ var require_tron = __commonJS({
         const messageHash = (0, tvm_escrow_encoding_1.hashTvmPermitWitnessTransferFrom)(messagePrehash);
         return { messageScheme: "EVM_PERMIT2", messageHash, messagePrehash: JSON.stringify(messagePrehash) };
       },
+      // Signs the TIP-712 typed data, not the bare digest, so a signer can inspect the fields it is
+      // authorizing (Turnkey policies read `eth.eip_712.message[...]`).
       async sign(signedMessage, privateKey) {
+        if (!signedMessage.message_prehash) {
+          throw new Error("Tron adapter sign(): signed_messages[i].message_prehash is required");
+        }
+        const prehash = JSON.parse(signedMessage.message_prehash);
+        const prehashDigest = (0, tvm_escrow_encoding_1.hashTvmPermitWitnessTransferFrom)(prehash);
+        if (prehashDigest.toLowerCase() !== signedMessage.message.toLowerCase()) {
+          throw new Error(`Tron adapter sign(): message_prehash implies digest ${prehashDigest} but message is ${signedMessage.message}`);
+        }
         const wallet = new ethers_1.Wallet(privateKey.startsWith("0x") ? privateKey : "0x" + privateKey);
-        return wallet.signingKey.sign(signedMessage.message).serialized;
+        return wallet.signTypedData(prehash.domain, prehash.types, prehash.message);
       },
       recoverSigner(signed, source) {
         let recovered;
@@ -2443,9 +2473,34 @@ var require_dist4 = __commonJS({
 var import_tvm_escrow_encoding = __toESM(require_dist2(), 1);
 var import_payment_request_sender_auth = __toESM(require_dist4(), 1);
 import * as z from "zod/mini";
-import { Method } from "mppx";
+import { Method, PaymentRequest as OpaqueCodec } from "mppx";
 var METHOD_NAME = "atum-escrow";
 var INTENT = "charge";
+var INTENT_ID_META_KEY = "atumIntentId";
+var REQUEST_ID_PREFIX = "req_mpp_";
+function chargeRequestId(intentId, account) {
+  return (0, import_payment_request_sender_auth.deterministicRequestId)({ anchor: intentId, account, prefix: REQUEST_ID_PREFIX });
+}
+function intentIdOf(challenge) {
+  const fromMeta = challenge.meta?.[INTENT_ID_META_KEY];
+  if (typeof fromMeta === "string" && fromMeta !== "") {
+    return fromMeta;
+  }
+  if (challenge.opaque === void 0) {
+    return void 0;
+  }
+  let decoded;
+  try {
+    decoded = OpaqueCodec.deserialize(challenge.opaque);
+  } catch {
+    return void 0;
+  }
+  if (typeof decoded !== "object" || decoded === null) {
+    return void 0;
+  }
+  const value = decoded[INTENT_ID_META_KEY];
+  return typeof value === "string" && value !== "" ? value : void 0;
+}
 var ChargeRequestSchema = z.object({
   /** The source chain/token/cap the payer funds from (one option per challenge). */
   source: z.object({
@@ -2571,6 +2626,9 @@ export {
   import_payment_request_sender_auth,
   METHOD_NAME,
   INTENT,
+  INTENT_ID_META_KEY,
+  chargeRequestId,
+  intentIdOf,
   ChargeRequestSchema,
   CredentialPayloadSchema,
   atumEscrowChargeMethod,