@atumlabs/mppx-atum-escrow 0.2.2 → 0.3.0

package/dist/{chunk-IPZJXELQ.js → chunk-ZFA5SSUP.js}

@@ -1,5 +1,6 @@
 import { createRequire as __atumCreateRequire } from 'module'; const require = __atumCreateRequire(import.meta.url);
 import {
+  INTENT_ID_META_KEY,
   __commonJS,
   __esm,
   __export,
@@ -9,9 +10,12 @@ import {
   assetIdentifier,
   atumEscrowChargeMethod,
   chainDefaultsFromExtra,
+  chargeRequestId,
+  intentIdOf,
   namespaceOf,
-  require_dist
-} from "./chunk-4P34CLTO.js";
+  require_dist,
+  require_dist2
+} from "./chunk-Z3AUNEU5.js";
 
 // ../node_modules/.pnpm/delayed-stream@1.0.0/node_modules/delayed-stream/lib/delayed_stream.js
 var require_delayed_stream = __commonJS({
@@ -15185,7 +15189,7 @@ var require_axios = __commonJS({
 });
 
 // ../payment-gateway-client/dist/index.js
-var require_dist2 = __commonJS({
+var require_dist3 = __commonJS({
   "../payment-gateway-client/dist/index.js"(exports, module) {
     "use strict";
     var __create = Object.create;
@@ -15380,7 +15384,7 @@ var require_dist2 = __commonJS({
         }
       }
     });
-    var require_dist3 = __commonJS2({
+    var require_dist4 = __commonJS2({
       "../contracts/tvm/escrow-encoding/typescript/dist/index.js"(exports2) {
         "use strict";
         Object.defineProperty(exports2, "__esModule", { value: true });
@@ -15423,12 +15427,14 @@ var require_dist2 = __commonJS({
       "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/utils.js"(exports2) {
         "use strict";
         Object.defineProperty(exports2, "__esModule", { value: true });
-        exports2.SOLANA_REPLAY_SLOTS = exports2.PERMIT_NONCE_DOMAIN = exports2.REPLAY_HORIZON_SECS = void 0;
+        exports2.REQUEST_ID_DOMAIN = exports2.SOLANA_REPLAY_SLOTS = exports2.PERMIT_NONCE_DOMAIN = exports2.REPLAY_HORIZON_SECS = void 0;
         exports2.resolvePermitDeadline = resolvePermitDeadline;
         exports2.generatePermitNonce = generatePermitNonce;
         exports2.resolvePermitNonce = resolvePermitNonce;
+        exports2.canonicalDepositor = canonicalDepositor2;
         exports2.deterministicPermitNonce = deterministicPermitNonce2;
         exports2.deterministicSolanaNonce = deterministicSolanaNonce2;
+        exports2.deterministicRequestId = deterministicRequestId;
         exports2.sameAddress = sameAddress;
         exports2.assertKeyMatchesSender = assertKeyMatchesSender2;
         exports2.assertToken = assertToken;
@@ -15454,7 +15460,7 @@ var require_dist2 = __commonJS({
         exports2.PERMIT_NONCE_DOMAIN = "atum-permit:v1:";
         exports2.SOLANA_REPLAY_SLOTS = 235n;
         var SOLANA_BUCKET_BITS = 17n;
-        function canonicalDepositor(depositor) {
+        function canonicalDepositor2(depositor) {
           const lower = depositor.toLowerCase();
           return lower.startsWith("0x") ? lower : depositor;
         }
@@ -15462,7 +15468,7 @@ var require_dist2 = __commonJS({
           if (!requestId) {
             throw new Error("sender_auth: request_id is required to derive a deterministic permit nonce");
           }
-          return BigInt((0, ethers_1.keccak256)((0, ethers_1.toUtf8Bytes)(`${exports2.PERMIT_NONCE_DOMAIN}${requestId}:${canonicalDepositor(depositor)}`)));
+          return BigInt((0, ethers_1.keccak256)((0, ethers_1.toUtf8Bytes)(`${exports2.PERMIT_NONCE_DOMAIN}${requestId}:${canonicalDepositor2(depositor)}`)));
         }
         function deterministicPermitNonce2(params) {
           return permitNonceSeed(params.requestId, params.depositor);
@@ -15473,6 +15479,20 @@ var require_dist2 = __commonJS({
           const bucket = (seed >> 8n) % (1n << SOLANA_BUCKET_BITS);
           return bucket << 32n | slot;
         }
+        exports2.REQUEST_ID_DOMAIN = "atum-request:v1:";
+        function deterministicRequestId(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)(`${exports2.REQUEST_ID_DOMAIN}${params.anchor}:${canonicalDepositor2(params.account)}`));
+          return `${params.prefix}${digest.slice(2, 26)}`;
+        }
         function sameAddress(a, b) {
           if (a.startsWith("0x") && b.startsWith("0x")) {
             return a.toLowerCase() === b.toLowerCase();
@@ -16044,7 +16064,7 @@ var require_dist2 = __commonJS({
         exports2.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)");
@@ -16072,6 +16092,10 @@ var require_dist2 = __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);
           },
@@ -16149,14 +16173,14 @@ var require_dist2 = __commonJS({
         Object.defineProperty(exports2, "__esModule", { value: true });
         exports2.tronAdapter = void 0;
         var ethers_1 = __require("ethers");
-        var tvm_escrow_encoding_1 = require_dist3();
+        var tvm_escrow_encoding_1 = require_dist4();
         var utils_js_1 = require_utils();
         var errors_js_1 = require_errors();
         var chain_id_js_1 = require_chain_id2();
         exports2.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)");
@@ -16179,9 +16203,19 @@ var require_dist2 = __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;
@@ -17497,7 +17531,7 @@ var require_dist2 = __commonJS({
         }
       }
     });
-    var require_dist4 = __commonJS2({
+    var require_dist42 = __commonJS2({
       "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/index.js"(exports2) {
         "use strict";
         var __createBinding = exports2 && exports2.__createBinding || (Object.create ? (function(o, m, k, k2) {
@@ -17782,6 +17816,7 @@ var require_dist2 = __commonJS({
           retryCounter;
           backoffHistogram;
           activityPendingCounter;
+          signDurationHistogram;
           // The private API scalar is held only long enough to construct the stamper. After
           // `getStamper()` runs, this is nulled out so the hex string doesn't survive on the heap
           // for the client's lifetime. Web Crypto holds the imported key as an opaque CryptoKey.
@@ -17810,6 +17845,10 @@ var require_dist2 = __commonJS({
             this.activityPendingCounter = meter.createCounter("turnkey.activity_pending_total", {
               description: "Activities that entered async polling (did not complete synchronously in the submit response), labeled by activity type"
             });
+            this.signDurationHistogram = meter.createHistogram("turnkey.sign_duration_ms", {
+              description: "Full Turnkey activity round-trip latency (concurrency-semaphore wait + submit + poll), labeled by activity type and outcome (success|error)",
+              unit: "ms"
+            });
           }
           emitRetry(reason, path) {
             try {
@@ -17829,6 +17868,12 @@ var require_dist2 = __commonJS({
             } catch {
             }
           }
+          emitSignDuration(durationMs, activityType, outcome) {
+            try {
+              this.signDurationHistogram.record(durationMs, { activity_type: activityType, outcome });
+            } catch {
+            }
+          }
           // ── public surface ─────────────────────────────────────────────────────────
           /** Boot-time reachability + auth probe. Throws TURNKEY_AUTH on bad credentials. */
           async whoami() {
@@ -17878,39 +17923,46 @@ var require_dist2 = __commonJS({
           }
           // ── activity submission ────────────────────────────────────────────────────
           async submitActivity(activityType, endpoint, parameters) {
-            const body = {
-              type: activityType,
-              timestampMs: String(Date.now()),
-              organizationId: this.opts.organizationId,
-              parameters
-            };
-            const signWith = typeof parameters.signWith === "string" ? parameters.signWith : void 0;
-            const ctx = `activity=${activityType}${signWith ? ` signWith=${signWith}` : ""}`;
-            const resp = await this.queryPost(`/public/v1/submit/${endpoint}`, body);
-            let activity = resp.activity;
-            const deadline = Date.now() + POLL_TIMEOUT_MS;
-            let pollAttempt = 0;
-            if (activity?.status === "ACTIVITY_STATUS_PENDING") {
-              this.emitActivityPending(activityType);
-            }
-            while (activity?.status === "ACTIVITY_STATUS_PENDING") {
-              if (Date.now() > deadline) {
-                throw (0, km_core_1.signerRetryable)(km_core_1.SignerErrorCode.TURNKEY_SIGNER_UNAVAILABLE, `Turnkey ${ctx} activityId=${activity.id} stayed PENDING past ${POLL_TIMEOUT_MS}ms`);
+            const start = Date.now();
+            let outcome = "error";
+            try {
+              const body = {
+                type: activityType,
+                timestampMs: String(Date.now()),
+                organizationId: this.opts.organizationId,
+                parameters
+              };
+              const signWith = typeof parameters.signWith === "string" ? parameters.signWith : void 0;
+              const ctx = `activity=${activityType}${signWith ? ` signWith=${signWith}` : ""}`;
+              const resp = await this.queryPost(`/public/v1/submit/${endpoint}`, body);
+              let activity = resp.activity;
+              const deadline = Date.now() + POLL_TIMEOUT_MS;
+              let pollAttempt = 0;
+              if (activity?.status === "ACTIVITY_STATUS_PENDING") {
+                this.emitActivityPending(activityType);
               }
-              const sleepIdx = Math.min(pollAttempt, POLL_BACKOFF_MS.length - 1);
-              await (0, promises_1.setTimeout)(POLL_BACKOFF_MS[sleepIdx]);
-              pollAttempt++;
-              const polled = await this.queryPost("/public/v1/query/get_activity", { organizationId: this.opts.organizationId, activityId: activity.id });
-              activity = polled.activity;
-            }
-            if (activity?.status !== "ACTIVITY_STATUS_COMPLETED") {
-              const failure = activity?.failure ?? {};
-              throw (0, km_core_1.signerTerminal)(km_core_1.SignerErrorCode.TURNKEY_ACTIVITY_FAILED, `Turnkey ${ctx} activityId=${activity?.id ?? "?"} status=${activity?.status ?? "unknown"}; ${JSON.stringify(failure)}`);
-            }
-            if (activity.result == null) {
-              throw (0, km_core_1.signerTerminal)(km_core_1.SignerErrorCode.TURNKEY_BAD_RESPONSE, `Turnkey ${ctx} activityId=${activity.id} COMPLETED but result was missing`);
+              while (activity?.status === "ACTIVITY_STATUS_PENDING") {
+                if (Date.now() > deadline) {
+                  throw (0, km_core_1.signerRetryable)(km_core_1.SignerErrorCode.TURNKEY_SIGNER_UNAVAILABLE, `Turnkey ${ctx} activityId=${activity.id} stayed PENDING past ${POLL_TIMEOUT_MS}ms`);
+                }
+                const sleepIdx = Math.min(pollAttempt, POLL_BACKOFF_MS.length - 1);
+                await (0, promises_1.setTimeout)(POLL_BACKOFF_MS[sleepIdx]);
+                pollAttempt++;
+                const polled = await this.queryPost("/public/v1/query/get_activity", { organizationId: this.opts.organizationId, activityId: activity.id });
+                activity = polled.activity;
+              }
+              if (activity?.status !== "ACTIVITY_STATUS_COMPLETED") {
+                const failure = activity?.failure ?? {};
+                throw (0, km_core_1.signerTerminal)(km_core_1.SignerErrorCode.TURNKEY_ACTIVITY_FAILED, `Turnkey ${ctx} activityId=${activity?.id ?? "?"} status=${activity?.status ?? "unknown"}; ${JSON.stringify(failure)}`);
+              }
+              if (activity.result == null) {
+                throw (0, km_core_1.signerTerminal)(km_core_1.SignerErrorCode.TURNKEY_BAD_RESPONSE, `Turnkey ${ctx} activityId=${activity.id} COMPLETED but result was missing`);
+              }
+              outcome = "success";
+              return activity.result;
+            } finally {
+              this.emitSignDuration(Date.now() - start, activityType, outcome);
             }
-            return activity.result;
           }
           // ── HTTP layer ────────────────────────────────────────────────────────────
           /**
@@ -18178,17 +18230,33 @@ var require_dist2 = __commonJS({
         "use strict";
         Object.defineProperty(exports2, "__esModule", { value: true });
         exports2.signSecp256k1PreimageAndVerify = signSecp256k1PreimageAndVerify;
+        exports2.signSecp256k1TypedDataAndVerify = signSecp256k1TypedDataAndVerify;
         exports2.bytesFromHexOrBytes = bytesFromHexOrBytes;
         var ethers_1 = __require("ethers");
         var km_core_1 = require_dist5();
+        var EIP712_HASH_FUNCTION = "HASH_FUNCTION_NOT_APPLICABLE";
         async function signSecp256k1PreimageAndVerify(client, signWith, preimage, expectedEvmAddrLower) {
           const preimageHex = (0, ethers_1.hexlify)(preimage).slice(2);
-          const { r, s, v } = await client.signRawPayload({
+          const parts = await client.signRawPayload({
             signWith,
             payload: preimageHex,
             encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
             hashFunction: "HASH_FUNCTION_KECCAK256"
           });
+          return recoverAndVerify(parts, (0, ethers_1.keccak256)(preimage), expectedEvmAddrLower);
+        }
+        async function signSecp256k1TypedDataAndVerify(client, signWith, domain, types, message, expectedEvmAddrLower) {
+          const payload = ethers_1.TypedDataEncoder.getPayload(domain, types, message);
+          const parts = await client.signRawPayload({
+            signWith,
+            payload: JSON.stringify(payload),
+            encoding: "PAYLOAD_ENCODING_EIP712",
+            hashFunction: EIP712_HASH_FUNCTION
+          });
+          const digestHex = ethers_1.TypedDataEncoder.hash(domain, types, message);
+          return recoverAndVerify(parts, digestHex, expectedEvmAddrLower);
+        }
+        function recoverAndVerify({ r, s, v }, digestHex, expectedEvmAddrLower) {
           let sig;
           try {
             sig = ethers_1.Signature.from({
@@ -18199,7 +18267,6 @@ var require_dist2 = __commonJS({
           } catch (err) {
             throw (0, km_core_1.signerTerminal)(km_core_1.SignerErrorCode.TURNKEY_BAD_RESPONSE, `Turnkey returned malformed secp256k1 signature parts r=${r} s=${s} v=${v}`, err instanceof Error ? err : void 0);
           }
-          const digestHex = (0, ethers_1.keccak256)(preimage);
           const recovered = (0, ethers_1.recoverAddress)(digestHex, sig).toLowerCase();
           if (recovered !== expectedEvmAddrLower) {
             throw (0, km_core_1.signerTerminal)(km_core_1.SignerErrorCode.TURNKEY_BAD_RESPONSE, `secp256k1 sign-then-recover mismatch: recovered ${recovered}, expected ${expectedEvmAddrLower}`);
@@ -18261,8 +18328,7 @@ ${msgBytes.length}`);
           }
           async signTypedData(domain, types, message) {
             const { signWith, lower } = this.requireAddresses();
-            const preimage = (0, ethers_1.getBytes)(ethers_1.TypedDataEncoder.encode(domain, types, message));
-            return (0, secp256k1_helpers_1.signSecp256k1PreimageAndVerify)(this.client, signWith, preimage, lower);
+            return (0, secp256k1_helpers_1.signSecp256k1TypedDataAndVerify)(this.client, signWith, domain, types, message, lower);
           }
           async signTransaction(tx) {
             const { signWith, lower } = this.requireAddresses();
@@ -18377,6 +18443,7 @@ ${msgBytes.length}`);
         };
         Object.defineProperty(exports2, "__esModule", { value: true });
         exports2.TurnkeySolanaSigner = void 0;
+        exports2.encodePayload = encodePayload;
         var web3_js_1 = __require("@solana/web3.js");
         var bs58_1 = __importDefault(__require("bs58"));
         var km_core_1 = require_dist5();
@@ -18410,8 +18477,7 @@ ${msgBytes.length}`);
             }
             const { r, s } = await this.client.signRawPayload({
               signWith: this.address,
-              payload: Buffer.from(bytes).toString("hex"),
-              encoding: "PAYLOAD_ENCODING_HEXADECIMAL",
+              ...encodePayload(bytes),
               hashFunction: "HASH_FUNCTION_NOT_APPLICABLE"
             });
             const sig = Buffer.concat([Buffer.from(stripHex(r), "hex"), Buffer.from(stripHex(s), "hex")]);
@@ -18452,6 +18518,15 @@ ${msgBytes.length}`);
           }
         };
         exports2.TurnkeySolanaSigner = TurnkeySolanaSigner2;
+        function encodePayload(bytes) {
+          const buf = Buffer.from(bytes);
+          const text = buf.toString("utf8");
+          const textual = buf.every((b) => b >= 32 && b <= 126 || b === 9 || b === 10 || b === 13);
+          if (textual && Buffer.from(text, "utf8").equals(buf)) {
+            return { payload: text, encoding: "PAYLOAD_ENCODING_TEXT_UTF8" };
+          }
+          return { payload: buf.toString("hex"), encoding: "PAYLOAD_ENCODING_HEXADECIMAL" };
+        }
         function stripHex(s) {
           return s.startsWith("0x") ? s.slice(2) : s;
         }
@@ -18517,8 +18592,7 @@ ${messageBytes.length}`);
           }
           async signTypedData(domain, types, message) {
             const { address, evmAddr } = this.requireReady();
-            const preimage = (0, ethers_1.getBytes)(ethers_1.TypedDataEncoder.encode(domain, types, message));
-            return (0, secp256k1_helpers_1.signSecp256k1PreimageAndVerify)(this.client, address, preimage, evmAddr);
+            return (0, secp256k1_helpers_1.signSecp256k1TypedDataAndVerify)(this.client, address, domain, types, message, evmAddr);
           }
           async signTransaction(tx) {
             const { address, evmAddr } = this.requireReady();
@@ -18889,7 +18963,7 @@ ${messageBytes.length}`);
             policyName: "allowSignRawPayload",
             effect: "EFFECT_ALLOW",
             condition: `activity.type in ['ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2', 'ACTIVITY_TYPE_SIGN_RAW_PAYLOADS'] && activity.params.hash_function in ['HASH_FUNCTION_KECCAK256', 'HASH_FUNCTION_NOT_APPLICABLE']`,
-            notes: "Allows signRawPayload with the hash functions the agent runtime uses."
+            notes: "Allows signRawPayload with the hash functions the runtime uses: KECCAK256 (EIP-191/TIP-191/W3C proofs) and NOT_APPLICABLE (Solana ed25519 + EIP-712 typed data)."
           };
         }
         function buildDenyApproveToNonAllowedSpenderEvm(args) {
@@ -19526,7 +19600,7 @@ ${detail}`);
           for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
         };
         Object.defineProperty(exports2, "__esModule", { value: true });
-        exports2.bytesFromHexOrBytes = exports2.signSecp256k1PreimageAndVerify = exports2.extractTronSignatureFromTransactionProtobuf = exports2.TurnkeyTronSigner = exports2.TurnkeySolanaSigner = exports2.TurnkeyEvmSigner = exports2.noopMeter = exports2.noopLogger = exports2.TURNKEY_RETRY_BACKOFF_MS = exports2.resolveTurnkeyAccountAddress = exports2.p1363ToDer = exports2.createTurnkeyStamper = exports2.createIsolatedTurnkeyClient = exports2.getOrCreateTurnkeyClient = exports2.TurnkeyClient = void 0;
+        exports2.bytesFromHexOrBytes = exports2.signSecp256k1PreimageAndVerify = exports2.extractTronSignatureFromTransactionProtobuf = exports2.TurnkeyTronSigner = exports2.encodePayload = exports2.TurnkeySolanaSigner = exports2.TurnkeyEvmSigner = exports2.noopMeter = exports2.noopLogger = exports2.TURNKEY_RETRY_BACKOFF_MS = exports2.resolveTurnkeyAccountAddress = exports2.p1363ToDer = exports2.createTurnkeyStamper = exports2.createIsolatedTurnkeyClient = exports2.getOrCreateTurnkeyClient = exports2.TurnkeyClient = void 0;
         var client_1 = require_client();
         Object.defineProperty(exports2, "TurnkeyClient", { enumerable: true, get: function() {
           return client_1.TurnkeyClient;
@@ -19569,6 +19643,9 @@ ${detail}`);
         Object.defineProperty(exports2, "TurnkeySolanaSigner", { enumerable: true, get: function() {
           return solana_1.TurnkeySolanaSigner;
         } });
+        Object.defineProperty(exports2, "encodePayload", { enumerable: true, get: function() {
+          return solana_1.encodePayload;
+        } });
         var tron_1 = require_tron2();
         Object.defineProperty(exports2, "TurnkeyTronSigner", { enumerable: true, get: function() {
           return tron_1.TurnkeyTronSigner;
@@ -19628,13 +19705,13 @@ ${detail}`);
       };
       switch (chainPrefix) {
         case "eip155": {
-          const { domain, types, message: typedMessage } = parsePrehash(messagePrehash, "EVM");
+          const { domain, types, message: typedMessage } = parsePrehash(messagePrehash, "EVM", message);
           const signer = new import_turnkey_signer.TurnkeyEvmSigner(client, deps);
           await signer.initialize();
           return { signature: await signer.signTypedData(domain, types, typedMessage) };
         }
         case "tron": {
-          const { domain, types, message: typedMessage } = parsePrehash(messagePrehash, "Tron");
+          const { domain, types, message: typedMessage } = parsePrehash(messagePrehash, "Tron", message);
           const signer = new import_turnkey_signer.TurnkeyTronSigner(client, deps);
           await signer.initialize();
           return { signature: await signer.signTypedData(domain, types, typedMessage) };
@@ -19662,7 +19739,7 @@ ${detail}`);
       }
       return Uint8Array.from(Buffer.from(hex, "hex"));
     }
-    function parsePrehash(messagePrehash, label) {
+    function parsePrehash(messagePrehash, label, advertisedDigest) {
       if (!messagePrehash) {
         throw new Error(`Turnkey ${label} signing requires signed_messages[0].message_prehash`);
       }
@@ -19676,15 +19753,24 @@ ${detail}`);
       if (!isObject(parsed) || !isObject(parsed.domain) || !isObject(parsed.types) || !isObject(parsed.message)) {
         throw new Error(`Turnkey ${label} signing: message_prehash must be a JSON object with domain, types and message`);
       }
-      return { domain: parsed.domain, types: parsed.types, message: parsed.message };
+      const { EIP712Domain: _derived, ...structTypes } = parsed.types;
+      const prehashDigest = import_ethers5.TypedDataEncoder.hash(parsed.domain, structTypes, parsed.message);
+      if (prehashDigest.toLowerCase() !== advertisedDigest.toLowerCase()) {
+        throw new Error(
+          `Turnkey ${label} signing: message_prehash implies digest ${prehashDigest} but message is ${advertisedDigest}`
+        );
+      }
+      return { domain: parsed.domain, types: structTypes, message: parsed.message };
     }
     var import_turnkey_signer;
+    var import_ethers5;
     var TURNKEY_API_URL;
     var DEFAULTS;
     var init_turnkey_impl = __esm2({
       "src/signers/turnkey-impl.ts"() {
         "use strict";
         import_turnkey_signer = __toESM2(require_dist6());
+        import_ethers5 = __require("ethers");
         TURNKEY_API_URL = "https://api.turnkey.com";
         DEFAULTS = {
           concurrencyLimit: 10,
@@ -20189,8 +20275,26 @@ ${detail}`);
        * 2. Find optimal settlement routes across chains/assets
        * 3. Secure funds in escrow
        * 4. Coordinate with settlement agents for execution
-       * 5. Return a real-time result if processing completes within 30 seconds,
-       * otherwise return a payment ID for status polling
+       * 5. Return a real-time result if settlement completes inside the synchronous window,
+       * otherwise return a payment ID and status for polling
+       *
+       * **Idempotency.** `request_id` is the idempotency key, scoped to the source account
+       * and originator. Submitting the same `request_id` again returns the ORIGINAL payment
+       * instead of charging a second time, so a client whose request timed out or failed
+       * in transit can safely re-submit.
+       *
+       * Because a re-submission must be admissible on its own, some fields legitimately
+       * differ between attempts and are excluded from the comparison: `quote_deadline` and
+       * `fulfillment_deadline` (both must be in the future, so a later attempt has to move
+       * them), and the `sender_auth` signature they are signed into.
+       *
+       * What must NOT differ is the payment's economics — source account and asset,
+       * destination accounts and assets, `fulfillment_amount`, and `max_source_amount` (the
+       * payer's own risk cap; lowering it on a retry describes a different payment, not the
+       * same one with less headroom). Re-using one `request_id` for a genuinely different
+       * payment is a client bug that would otherwise be silently collapsed onto the first
+       * payment, so it is rejected with `409` and `IDEMPOTENCY_TERMS_MISMATCH`. Use a
+       * distinct `request_id` per payment.
        *
        * @param data The data for the request.
        * @param data.requestBody
@@ -20207,6 +20311,11 @@ ${detail}`);
             400: "Invalid request",
             401: "Signature or sender authorization could not be verified",
             403: "Payment declined during counterparty authorization",
+            409: `The \`request_id\` has already been used for a payment with different economics
+(\`IDEMPOTENCY_TERMS_MISMATCH\`). Re-submitting one \`request_id\` is how a retry is
+made safe, so it must identify one payment; use a distinct \`request_id\` per
+payment.
+`,
             413: "Payment request too large to process",
             500: "Internal server error",
             503: "A dependency is temporarily unavailable"
@@ -20539,7 +20648,7 @@ ${detail}`);
       }
     };
     var import_ethers22 = __require("ethers");
-    var import_tvm_escrow_encoding = __toESM2(require_dist3());
+    var import_tvm_escrow_encoding = __toESM2(require_dist4());
     var tronAdapter = {
       turnkeyAddressFormat: "ADDRESS_FORMAT_TRON",
       resolveContractOverrides(sourceDefaults) {
@@ -20685,7 +20794,7 @@ ${detail}`);
       }
       return BigInt(Math.floor(Date.now() / 1e3)) - SOLANA_ISSUED_AT_FALLBACK_SKEW_SECS;
     }
-    var import_payment_request_sender_auth2 = __toESM2(require_dist4());
+    var import_payment_request_sender_auth2 = __toESM2(require_dist42());
     var $AuthorizationResult = {
       type: "object",
       description: `The result of a counterparty authorization request. Contains either
@@ -21177,11 +21286,18 @@ Required when regulatory compliance or KYC verification is needed for the paymen
     };
     var $PaymentResponse = {
       type: "object",
-      description: `Response from submitting a payment request. If processing completes within 30 seconds,
-the response will include a fulfillment_confirmation with full settlement details.
-Otherwise, you'll receive a payment_id that you can use to poll the
-/v1/payments/{paymentId}/status endpoint for updates.
+      description: `Response from submitting a payment request. If settlement completes inside the
+gateway's synchronous window, the response includes a fulfillment_confirmation with
+full settlement details. Otherwise you receive a payment_id plus the payment's
+current \`status\`, and can poll /v1/payments/{paymentId}/status for updates.
+
+Read \`status\` before deciding what to do next: a \`pending\` payment is in flight and
+must NOT be re-submitted under a new request_id (that would be a second payment),
+whereas a \`failed\` or \`cancelled\` one is terminal \u2014 re-submitting it under the SAME
+request_id resolves to the same terminal payment, so a genuine re-attempt needs a
+new request_id.
 `,
+      required: ["payment_id", "status", "idempotent_replay"],
       properties: {
         payment_id: {
           type: "string",
@@ -21189,8 +21305,60 @@ Otherwise, you'll receive a payment_id that you can use to poll the
 `,
           example: "550e8400-e29b-41d4-a716-446655440000"
         },
+        status: {
+          type: "string",
+          enum: ["pending", "completed", "failed", "cancelled"],
+          description: `Current status of the payment, with the same meaning as on
+/v1/payments/{paymentId}/status:
+- \`pending\`: accepted and being processed
+- \`completed\`: successfully delivered
+- \`failed\`: failed (funds returned if escrowed)
+- \`cancelled\`: cancelled before completion
+
+Present on every response. \`completed\` is always accompanied by
+fulfillment_confirmation; \`failed\` is accompanied by \`error\` where a reason has
+been recorded.
+`
+        },
+        idempotent_replay: {
+          type: "boolean",
+          description: `Whether this response describes a payment that already existed, rather than one
+created by this request. \`true\` means the request_id had been used before and you
+are being handed the ORIGINAL payment \u2014 no second payment was created and nothing
+additional was charged.
+
+**Re-attempting a payment.** Re-submit the same request and you get the same payment
+back. You may re-send the original bytes unchanged: the deadlines will have expired by
+then \u2014 \`quote_deadline\` bounds the auction and is short, while this endpoint may hold a
+submission for up to 30 seconds \u2014 and an expired deadline on a re-submission is not an
+error, because the request is resolved onto the payment that already exists rather than
+used to create one.
+
+Re-signing with fresh deadlines is equally fine and returns the same payment. What you
+must NOT change is the request_id, and what you must not change under it is the
+payment's economics \u2014 source, destination, fulfillment_amount, max_source_amount \u2014 which
+are rejected with 409 IDEMPOTENCY_TERMS_MISMATCH. Deadlines and the signature are
+exempt precisely so that a re-attempt is possible.
+
+A genuinely new payment needs a NEW request_id. In particular a \`failed\` payment is
+terminal: re-submitting its request_id keeps returning that dead payment, so recovering
+means starting a new one under a new key.
+
+Present on every response, \`false\` for a newly created payment. A response without
+the field is from a gateway predating it, not a newly created payment.
+
+This is the field to read when reconciling a suspected double charge: two
+submissions where the second reports \`true\` are one payment, whereas two both
+reporting \`false\` are two. It says nothing about how far the payment has got \u2014
+read \`status\` for that.
+`,
+          example: false
+        },
         fulfillment_confirmation: {
           "$ref": "#/components/schemas/FulfillmentConfirmation"
+        },
+        error: {
+          "$ref": "#/components/schemas/PaymentError"
         }
       }
     };
@@ -22280,12 +22448,12 @@ payment-status endpoint.
     function generateSolanaNonce() {
       return (0, import_solana_escrow_encoding.generateNonce)();
     }
-    var import_payment_request_sender_auth = __toESM2(require_dist4());
+    var import_payment_request_sender_auth3 = __toESM2(require_dist42());
     var RawSenderSigner = class {
       constructor(network, privateKey) {
         const adapter = getChainAdapter(network);
         adapter.validatePrivateKey?.(privateKey);
-        this.inner = (0, import_payment_request_sender_auth.localKeySigner)(network, adapter.formatPrivateKey(privateKey));
+        this.inner = (0, import_payment_request_sender_auth3.localKeySigner)(network, adapter.formatPrivateKey(privateKey));
       }
       sign(signedMessage) {
         return this.inner.sign(signedMessage);
@@ -22679,8 +22847,9 @@ payment-status endpoint.
 
 // src/client.ts
 var import_evm_escrow_encoding = __toESM(require_dist(), 1);
-var import_payment_gateway_client = __toESM(require_dist2(), 1);
-import { keccak256, toUtf8Bytes, Contract, MaxUint256 } from "ethers";
+var import_payment_request_sender_auth = __toESM(require_dist2(), 1);
+var import_payment_gateway_client = __toESM(require_dist3(), 1);
+import { Contract, MaxUint256 } from "ethers";
 import { Credential, Method } from "mppx";
 function registerClient(config) {
   const now = config.now ?? (() => Date.now());
@@ -22693,14 +22862,16 @@ function registerClient(config) {
       const nowMs = now();
       if (!(extra.quoteDeadlineSeconds > 0 && extra.quoteDeadlineSeconds < extra.fulfillmentDeadlineSeconds)) {
         throw new Error(
-          `atum-escrow: deadline ordering violated (now < quote_deadline < fulfillment_deadline); quoteDeadlineSeconds=${extra.quoteDeadlineSeconds}, fulfillmentDeadlineSeconds=${extra.fulfillmentDeadlineSeconds}`
+          `atum-escrow: the challenge's deadline budgets cannot produce a settleable payment. quoteDeadlineSeconds must be above zero and below fulfillmentDeadlineSeconds, because quote collection has to close before settlement is due. Got quoteDeadlineSeconds=${extra.quoteDeadlineSeconds}, fulfillmentDeadlineSeconds=${extra.fulfillmentDeadlineSeconds}. These come from the corridor the resource server offered, so this is a merchant-side configuration problem rather than anything a payer can correct.`
         );
       }
-      const anchorAccount = namespace === "eip155" ? account.toLowerCase() : account;
-      const idempotencyAnchor = keccak256(
-        toUtf8Bytes(`atum-escrow:${challenge.id}:${anchorAccount}`)
-      );
-      const requestId = `req_mpp_${idempotencyAnchor.slice(2, 26)}`;
+      const intentId = intentIdOf(challenge);
+      if (intentId === void 0) {
+        throw new Error(
+          `atum-escrow: the challenge carries no '${INTENT_ID_META_KEY}' metadata, so this payment cannot be made retry-safe and is refused. The merchant must stamp a stable per-purchase identifier into the challenge metadata (see buildChargeChallenge); without it a retry would be charged as a second payment.`
+        );
+      }
+      const requestId = chargeRequestId(intentId, account);
       const sourceDefaults = chainDefaultsFromExtra(extra, source.network);
       const sourceAssetId = assetIdentifier(source.network, source.asset);
       const isSolana = namespace === "solana";
@@ -22733,7 +22904,12 @@ function registerClient(config) {
           solanaRpcUrl: "atum-escrow:offline",
           solanaClockReader: solanaIssuedAt != null ? async () => BigInt(solanaIssuedAt) : config.solanaClockReader ?? (async () => BigInt(Math.floor(nowMs / 1e3)))
         } : {
-          nonce: BigInt(idempotencyAnchor),
+          // No explicit nonce: `preparePaymentRequest` derives it from
+          // (request_id, depositor) via the shared sender_auth SDK — the same
+          // Go-parity-locked derivation every consumer uses. Since request_id is itself
+          // anchored on the intentId above, a rebuild reproduces the same single-use
+          // permit. Overriding it here would fork a second nonce recipe for no gain.
+          //
           // Keep the deposit deadline at least as late as fulfillment. pgc converts this
           // relative budget to an absolute permit deadline against the same clock; round
           // the budget up and add a second so it never truncates below fulfillment_deadline.
@@ -22746,7 +22922,7 @@ function registerClient(config) {
       return Credential.serialize({
         challenge,
         payload: { paymentRequest },
-        source: `did:pkh:${source.network}:${anchorAccount}`
+        source: `did:pkh:${source.network}:${(0, import_payment_request_sender_auth.canonicalDepositor)(account)}`
       });
     }
   });
@@ -22758,14 +22934,8 @@ function buildSenderSigner(network, signer, account) {
   if (isSenderSigner(signer)) {
     return signer;
   }
-  if (signer.provider === "turnkey") {
-    throw new Error(
-      "atum-escrow: construct a Turnkey SenderSigner with the payment-gateway client and pass it as `signer`"
-    );
-  }
   return (0, import_payment_gateway_client.createSenderSigner)(network, {
-    provider: "raw",
-    privateKey: signer.privateKey,
+    ...signer,
     pinnedAddress: signer.pinnedAddress ?? account
   });
 }