@atumlabs/mppx-atum-escrow 0.3.0 → 0.4.1

package/dist/{chunk-Z3AUNEU5.js → chunk-LAWFMGYD.js}

@@ -11,11 +11,20 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 var __commonJS = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -39,6 +48,307 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// ../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/types.js
+var require_types = __commonJS({
+  "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/types.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+  }
+});
+
+// ../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/destination.js
+var require_destination = __commonJS({
+  "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/destination.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.DESTINATION_COMMITMENT_WITNESS_VERSION = exports.MAX_DESTINATION_BYTES = void 0;
+    exports.usesDestinationCommitment = usesDestinationCommitment;
+    exports.deriveDepositRequestHash = deriveDepositRequestHash;
+    exports.buildEscrowDestination = buildEscrowDestination;
+    var ethers_1 = __require("ethers");
+    exports.MAX_DESTINATION_BYTES = 256;
+    var NAMESPACE_EIP155 = "eip155";
+    exports.DESTINATION_COMMITMENT_WITNESS_VERSION = 4;
+    function usesDestinationCommitment(depositWitnessVersion) {
+      return depositWitnessVersion === void 0 || depositWitnessVersion >= exports.DESTINATION_COMMITMENT_WITNESS_VERSION;
+    }
+    function deriveDepositRequestHash(requestId) {
+      if (requestId === "") {
+        throw new Error('sender_auth: cannot derive deposit_request_hash: request_id is empty, and keccak256("") is a perfectly valid non-zero bytes32, so this would silently commit every empty-id deposit to the same hash instead of failing');
+      }
+      return (0, ethers_1.keccak256)((0, ethers_1.toUtf8Bytes)(requestId));
+    }
+    function buildEscrowDestination(assetIdentifier2, account) {
+      if (assetIdentifier2 === "") {
+        throw new Error("sender_auth: destination asset_identifier is empty");
+      }
+      if (account === "") {
+        throw new Error("sender_auth: destination account is empty");
+      }
+      if (assetIdentifier2.includes("@") || account.includes("@")) {
+        throw new Error(`sender_auth: destination asset_identifier (${JSON.stringify(assetIdentifier2)}) and account (${JSON.stringify(account)}) must not contain '@': it is the separator between them in the committed destination grammar`);
+      }
+      const namespace = caip2Namespace(assetIdentifier2);
+      let asset = assetIdentifier2;
+      let acct = account;
+      if (namespace === NAMESPACE_EIP155) {
+        asset = asset.toLowerCase();
+        acct = acct.toLowerCase();
+      }
+      const destination = `${asset}@${acct}`;
+      const byteLength = (0, ethers_1.toUtf8Bytes)(destination).length;
+      if (byteLength > exports.MAX_DESTINATION_BYTES) {
+        throw new Error(`sender_auth: composed destination is ${byteLength} bytes, over the escrow's MAX_DESTINATION_BYTES of ${exports.MAX_DESTINATION_BYTES}: the contract reverts DestinationTooLong, so this deposit could never be redeemed`);
+      }
+      return destination;
+    }
+    function caip2Namespace(assetIdentifier2) {
+      const slash = assetIdentifier2.indexOf("/");
+      const chainPart = slash === -1 ? "" : assetIdentifier2.slice(0, slash);
+      const assetPart = slash === -1 ? "" : assetIdentifier2.slice(slash + 1);
+      if (slash === -1 || chainPart === "" || assetPart === "") {
+        const looksLegacy = !assetIdentifier2.includes("/") && countChar(assetIdentifier2, ":") === 2;
+        const hint = looksLegacy ? " (this looks like the deprecated `<chain>:<ref>:<asset>` form; migrate it to `<chain>:<ref>/<asset-namespace>:<asset-reference>`)" : "";
+        throw new Error(`sender_auth: destination asset_identifier ${JSON.stringify(assetIdentifier2)} is not CAIP-19: expected <caip2-chain-id>/<asset-namespace>:<asset-reference>${hint}`);
+      }
+      const assetColon = assetPart.indexOf(":");
+      if (assetColon <= 0 || assetColon === assetPart.length - 1) {
+        throw new Error(`sender_auth: destination asset_identifier ${JSON.stringify(assetIdentifier2)} has a malformed asset part ${JSON.stringify(assetPart)}: expected <asset-namespace>:<asset-reference>`);
+      }
+      const assetNamespace = assetPart.slice(0, assetColon);
+      if (assetNamespace !== assetNamespace.toLowerCase()) {
+        throw new Error(`sender_auth: destination asset_identifier ${JSON.stringify(assetIdentifier2)} has a non-canonical asset namespace ${JSON.stringify(assetNamespace)}: the ratified grammar requires it lowercase (${JSON.stringify(assetNamespace.toLowerCase())}). It is rejected rather than normalised because the destination commitment is over these exact bytes`);
+      }
+      const chainColon = chainPart.indexOf(":");
+      if (chainColon <= 0 || chainColon === chainPart.length - 1) {
+        throw new Error(`sender_auth: destination asset_identifier ${JSON.stringify(assetIdentifier2)} has a malformed chain part ${JSON.stringify(chainPart)}: expected <namespace>:<reference>`);
+      }
+      const namespace = chainPart.slice(0, chainColon);
+      if (namespace !== namespace.toLowerCase()) {
+        throw new Error(`sender_auth: destination asset_identifier ${JSON.stringify(assetIdentifier2)} has a non-canonical chain namespace ${JSON.stringify(namespace)}: the ratified grammar requires it lowercase (${JSON.stringify(namespace.toLowerCase())}). It is rejected rather than normalised because the destination commitment is over these exact bytes`);
+      }
+      return namespace;
+    }
+    function countChar(s, c) {
+      let n = 0;
+      for (const ch of s) {
+        if (ch === c)
+          n++;
+      }
+      return n;
+    }
+  }
+});
+
+// ../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/utils.js
+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.REQUEST_ID_DOMAIN = exports.SOLANA_REPLAY_BUCKETS = 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.parseSourceAsset = parseSourceAsset;
+    exports.sameAddress = sameAddress2;
+    exports.assertKeyMatchesSender = assertKeyMatchesSender;
+    exports.assertToken = assertToken;
+    exports.assertAmountMatches = assertAmountMatches;
+    exports.assertFresh = assertFresh;
+    exports.assertSpender = assertSpender;
+    exports.assertWitnessRoles = assertWitnessRoles;
+    exports.assertRolePairComplete = assertRolePairComplete;
+    exports.assertDestination = assertDestination;
+    exports.assertDepositRequestHash = assertDepositRequestHash;
+    exports.nowSec = nowSec;
+    var ethers_1 = __require("ethers");
+    var destination_js_1 = require_destination();
+    exports.REPLAY_HORIZON_SECS = 128;
+    function resolvePermitDeadline(deadline) {
+      return BigInt(deadline);
+    }
+    function generatePermitNonce() {
+      const rand = new Uint32Array(1);
+      globalThis.crypto.getRandomValues(rand);
+      return (BigInt(Date.now()) << 32n) + BigInt(rand[0]);
+    }
+    function resolvePermitNonce(nonce) {
+      return BigInt(nonce);
+    }
+    exports.PERMIT_NONCE_DOMAIN = "atum-permit:v1:";
+    exports.SOLANA_REPLAY_SLOTS = 235n;
+    exports.SOLANA_REPLAY_BUCKETS = 256n;
+    function canonicalDepositor(depositor) {
+      const lower = depositor.toLowerCase();
+      return lower.startsWith("0x") ? lower : depositor;
+    }
+    function permitNonceSeed(requestId, depositor) {
+      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)(`${exports.PERMIT_NONCE_DOMAIN}${requestId}:${canonicalDepositor(depositor)}`)));
+    }
+    function deterministicPermitNonce(params) {
+      return permitNonceSeed(params.requestId, params.depositor);
+    }
+    function deterministicSolanaNonce(params) {
+      const seed = permitNonceSeed(params.requestId, params.depositor);
+      const slot = seed % exports.SOLANA_REPLAY_SLOTS;
+      const bucket = (seed >> 8n) % exports.SOLANA_REPLAY_BUCKETS;
+      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 parseSourceAsset(assetIdentifier2) {
+      const parts = typeof assetIdentifier2 === "string" ? assetIdentifier2.split("/") : [];
+      const nsParts = parts[1]?.split(":");
+      if (parts.length === 3 && parts[0] && parts[1] && parts[2]) {
+        throw new Error(`sender_auth: source asset ${JSON.stringify(assetIdentifier2)} names a token id, which a deposit cannot bind`);
+      }
+      if (parts.length !== 2 || !parts[0] || !nsParts || nsParts.length !== 2 || !nsParts[0] || !nsParts[1]) {
+        throw new Error(`sender_auth: invalid source asset ${JSON.stringify(assetIdentifier2)}`);
+      }
+      return { network: parts[0], asset: nsParts[1] };
+    }
+    function sameAddress2(a, b) {
+      if (a.startsWith("0x") && b.startsWith("0x")) {
+        return a.toLowerCase() === b.toLowerCase();
+      }
+      return a === b;
+    }
+    function assertKeyMatchesSender(matches, sender, derived) {
+      if (!matches) {
+        throw new Error(`sender_auth: private key derives ${derived}, not the expected sender ${sender}`);
+      }
+    }
+    function assertToken(token, sourceAsset, normalize) {
+      if (!sameAddress2(token, normalize(sourceAsset))) {
+        throw new Error("sender_auth: permit token does not match the source asset");
+      }
+    }
+    function assertAmountMatches(amount, maxSourceAmount) {
+      if (BigInt(amount) !== BigInt(maxSourceAmount)) {
+        throw new Error("sender_auth: permit amount does not match max_source_amount");
+      }
+    }
+    function assertFresh(deadlineSec, nowSec2) {
+      if (deadlineSec <= nowSec2) {
+        throw new Error("sender_auth: permit deadline is not in the future");
+      }
+    }
+    function assertSpender(spender, escrow, normalize) {
+      if (!sameAddress2(spender, normalize(escrow))) {
+        throw new Error("sender_auth: permit spender is not the source escrow");
+      }
+    }
+    function assertWitnessRoles(reserver, releaser, expectedReserver, expectedReleaser, normalize) {
+      if (!sameAddress2(reserver, normalize(expectedReserver)) || !sameAddress2(releaser, normalize(expectedReleaser))) {
+        throw new Error("sender_auth: deposit witness roles do not match the challenge");
+      }
+    }
+    function assertRolePairComplete(reserver, releaser) {
+      if (reserver === void 0 !== (releaser === void 0)) {
+        throw new Error("sender_auth: reserver and releaser must be supplied together");
+      }
+    }
+    function assertDestination(signed, expected) {
+      if (signed !== expected) {
+        throw new Error(`sender_auth: signed deposit destination ${JSON.stringify(signed)} does not match the expected destination ${JSON.stringify(expected)} \u2014 the escrow stores only keccak256(bytes(destination)) and cannot tell a formatting disagreement from a wrong payee, so a deposit signed against this destination could be neither released nor refunded`);
+      }
+    }
+    function assertDepositRequestHash(signedHex, expectedRequestId) {
+      const expected = (0, destination_js_1.deriveDepositRequestHash)(expectedRequestId);
+      if (signedHex.toLowerCase() !== expected.toLowerCase()) {
+        throw new Error(`sender_auth: signed deposit_request_hash ${signedHex} is not keccak256(request_id) for request_id ${JSON.stringify(expectedRequestId)} (expected ${expected}): the deposit authorizes a different payment request`);
+      }
+    }
+    function nowSec() {
+      return Math.floor(Date.now() / 1e3);
+    }
+  }
+});
+
+// ../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/chain-id.js
+var require_chain_id = __commonJS({
+  "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/chain-id.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.TRON_PERMIT2_FALLBACKS = exports.TRON_CHAIN_IDS = exports.MAX_EVM_CHAIN_ID = void 0;
+    exports.namespaceOf = namespaceOf2;
+    exports.evmChainId = evmChainId;
+    exports.tronNumericChainId = tronNumericChainId;
+    exports.resolveTronPermit2 = resolveTronPermit22;
+    exports.clusterIdFromName = clusterIdFromName;
+    function namespaceOf2(network) {
+      return network.split(":")[0];
+    }
+    exports.MAX_EVM_CHAIN_ID = Number.MAX_SAFE_INTEGER;
+    function evmChainId(network) {
+      const match = /^eip155:([0-9]+)$/.exec(network);
+      if (!match) {
+        throw new Error(`sender_auth: expected an eip155 network, got ${network}`);
+      }
+      const chainId = Number(match[1]);
+      if (chainId > exports.MAX_EVM_CHAIN_ID) {
+        throw new Error(`sender_auth: eip155 chain id ${match[1]} exceeds the EIP-2294 maximum (${exports.MAX_EVM_CHAIN_ID})`);
+      }
+      return chainId;
+    }
+    exports.TRON_CHAIN_IDS = {
+      mainnet: 728126428,
+      shasta: 2494104990
+    };
+    function tronNumericChainId(network) {
+      if (namespaceOf2(network) !== "tron") {
+        throw new Error(`sender_auth: expected a tron network, got ${network}`);
+      }
+      const segments = network.split(":");
+      const cluster = segments.length === 2 ? segments[1] : void 0;
+      const id = cluster !== void 0 && Object.hasOwn(exports.TRON_CHAIN_IDS, cluster) ? exports.TRON_CHAIN_IDS[cluster] : void 0;
+      if (typeof id !== "number") {
+        throw new Error(`sender_auth: unsupported Tron network '${network}'`);
+      }
+      return id;
+    }
+    exports.TRON_PERMIT2_FALLBACKS = {
+      "tron:mainnet": "TJhMXTHQHeQyMD7TcKQFqAePNgG4b31H9m",
+      "tron:shasta": "TPUqJPASUn1zLvbLBgRZ5pBYrx7WSe5ahp"
+    };
+    function resolveTronPermit22(network) {
+      const resolved = Object.hasOwn(exports.TRON_PERMIT2_FALLBACKS, network) ? exports.TRON_PERMIT2_FALLBACKS[network] : void 0;
+      if (typeof resolved !== "string" || resolved === "") {
+        throw new Error(`sender_auth: no Permit2 address known for Tron network '${network}'`);
+      }
+      return resolved;
+    }
+    function clusterIdFromName(name) {
+      const encoded = new TextEncoder().encode(name);
+      if (encoded.length > 32) {
+        throw new Error(`sender_auth: Solana cluster name too long (${encoded.length} > 32 bytes): ${name}`);
+      }
+      const out = new Uint8Array(32);
+      out.set(encoded);
+      return out;
+    }
+  }
+});
+
 // ../contracts/evm/escrow-encoding/typescript/dist/payment-id.js
 var require_payment_id = __commonJS({
   "../contracts/evm/escrow-encoding/typescript/dist/payment-id.js"(exports) {
@@ -78,7 +388,7 @@ var require_permit_types = __commonJS({
   "../contracts/evm/escrow-encoding/typescript/dist/permit-types.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.REFUND_WITNESS_TYPES = exports.RELEASE_WITNESS_TYPES = exports.RESERVE_WITNESS_TYPES = exports.PERMIT_WITNESS_TYPES_V2 = exports.PERMIT_WITNESS_TYPES = void 0;
+    exports.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH = exports.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH = exports.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE = exports.PERMIT_WITNESS_TYPES_WITH_DESTINATION = exports.REFUND_WITNESS_TYPES = exports.RELEASE_WITNESS_TYPES = exports.RESERVE_WITNESS_TYPES = exports.PERMIT_WITNESS_TYPES_V2 = exports.PERMIT_WITNESS_TYPES = void 0;
     exports.createPermit2Domain = createPermit2Domain;
     exports.createEscrowDomain = createEscrowDomain;
     exports.PERMIT_WITNESS_TYPES = {
@@ -161,6 +471,63 @@ var require_permit_types = __commonJS({
         { name: "settler", type: "address" }
       ]
     };
+    exports.PERMIT_WITNESS_TYPES_WITH_DESTINATION = {
+      PermitWitnessTransferFrom: [
+        { name: "permitted", type: "TokenPermissions" },
+        { name: "spender", type: "address" },
+        { name: "nonce", type: "uint256" },
+        { name: "deadline", type: "uint256" },
+        { name: "witness", type: "DepositWitness" }
+      ],
+      TokenPermissions: [
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" }
+      ],
+      DepositWitness: [
+        { name: "depositRequestHash", type: "bytes32" },
+        { name: "destination", type: "string" },
+        { name: "reserver", type: "address" },
+        { name: "releaser", type: "address" }
+      ]
+    };
+    exports.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE = {
+      ReserveWitness: [
+        { name: "depositId", type: "bytes32" },
+        { name: "quoteHash", type: "bytes32" },
+        { name: "settler", type: "address" },
+        { name: "sourceAmount", type: "uint256" }
+      ]
+    };
+    exports.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH = {
+      ReleaseWitness: [
+        { name: "depositId", type: "bytes32" },
+        { name: "quoteHash", type: "bytes32" },
+        { name: "depositRequestHash", type: "bytes32" },
+        { name: "destinationHash", type: "bytes32" },
+        { name: "depositor", type: "address" },
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" },
+        { name: "feeAmount", type: "uint256" },
+        { name: "reserver", type: "address" },
+        { name: "releaser", type: "address" },
+        { name: "settler", type: "address" }
+      ]
+    };
+    exports.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH = {
+      RefundWitness: [
+        { name: "depositId", type: "bytes32" },
+        { name: "quoteHash", type: "bytes32" },
+        { name: "depositRequestHash", type: "bytes32" },
+        { name: "destinationHash", type: "bytes32" },
+        { name: "depositor", type: "address" },
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" },
+        { name: "feeAmount", type: "uint256" },
+        { name: "reserver", type: "address" },
+        { name: "releaser", type: "address" },
+        { name: "settler", type: "address" }
+      ]
+    };
   }
 });
 
@@ -287,6 +654,8 @@ var require_escrow_abi = __commonJS({
                 name: "depositWitness",
                 type: "tuple",
                 components: [
+                  { name: "depositRequestHash", type: "bytes32" },
+                  { name: "destination", type: "string" },
                   { name: "reserver", type: "address" },
                   { name: "releaser", type: "address" }
                 ]
@@ -296,15 +665,17 @@ var require_escrow_abi = __commonJS({
                 name: "reserveWitness",
                 type: "tuple",
                 components: [
-                  { name: "paymentId", type: "bytes32" },
-                  { name: "settler", type: "address" }
+                  { name: "depositId", type: "bytes32" },
+                  { name: "quoteHash", type: "bytes32" },
+                  { name: "settler", type: "address" },
+                  { name: "sourceAmount", type: "uint256" }
                 ]
               },
               { name: "reserveSignature", type: "bytes" }
             ]
           }
         ],
-        outputs: [{ name: "paymentId", type: "bytes32" }],
+        outputs: [{ name: "depositId", type: "bytes32" }],
         stateMutability: "nonpayable"
       },
       {
@@ -319,7 +690,10 @@ var require_escrow_abi = __commonJS({
                 name: "refundWitness",
                 type: "tuple",
                 components: [
-                  { name: "paymentId", type: "bytes32" },
+                  { name: "depositId", type: "bytes32" },
+                  { name: "quoteHash", type: "bytes32" },
+                  { name: "depositRequestHash", type: "bytes32" },
+                  { name: "destinationHash", type: "bytes32" },
                   { name: "depositor", type: "address" },
                   { name: "token", type: "address" },
                   { name: "amount", type: "uint256" },
@@ -339,7 +713,7 @@ var require_escrow_abi = __commonJS({
       {
         type: "function",
         name: "getDepositHash",
-        inputs: [{ name: "paymentId", type: "bytes32" }],
+        inputs: [{ name: "depositId", type: "bytes32" }],
         outputs: [{ name: "", type: "bytes32" }],
         stateMutability: "view"
       },
@@ -355,14 +729,67 @@ var require_escrow_abi = __commonJS({
   }
 });
 
-// ../contracts/evm/escrow-encoding/typescript/dist/reserve-encoder.js
-var require_reserve_encoder = __commonJS({
+// ../contracts/evm/escrow-encoding/typescript/dist/witness-values.js
+var require_witness_values = __commonJS({
+  "../contracts/evm/escrow-encoding/typescript/dist/witness-values.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.normalizeBytes32 = normalizeBytes32;
+    exports.normalizeAddressField = normalizeAddressField;
+    exports.normalizeUint256 = normalizeUint256;
+    exports.chainIdToHex = chainIdToHex;
+    var ethers_1 = __require("ethers");
+    function normalizeBytes32(label, value) {
+      let bytes;
+      try {
+        bytes = (0, ethers_1.getBytes)(value);
+      } catch {
+        throw new Error(`${label} must be 0x-prefixed hex (32 bytes), got ${JSON.stringify(value)}`);
+      }
+      if (bytes.length !== 32) {
+        throw new Error(`${label} must be exactly 32 bytes, got ${bytes.length}`);
+      }
+      return (0, ethers_1.hexlify)(bytes);
+    }
+    function normalizeAddressField(label, value) {
+      try {
+        return (0, ethers_1.getAddress)(value);
+      } catch {
+        throw new Error(`${label} must be a 20-byte hex address, got ${JSON.stringify(value)}`);
+      }
+    }
+    function normalizeUint256(label, value) {
+      let n;
+      try {
+        n = BigInt(value);
+      } catch {
+        throw new Error(`${label} must be an integer (bigint or decimal string), got ${JSON.stringify(value)}`);
+      }
+      if (n < 0n) {
+        throw new Error(`${label} must be non-negative (uint256), got ${n.toString()}`);
+      }
+      return n.toString();
+    }
+    function chainIdToHex(chainId) {
+      if (!Number.isSafeInteger(chainId) || chainId < 0) {
+        throw new Error(`chainId must be a non-negative safe integer, got ${chainId}`);
+      }
+      return `0x${chainId.toString(16)}`;
+    }
+  }
+});
+
+// ../contracts/evm/escrow-encoding/typescript/dist/reserve-encoder.js
+var require_reserve_encoder = __commonJS({
   "../contracts/evm/escrow-encoding/typescript/dist/reserve-encoder.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.computeReserveDigest = computeReserveDigest;
+    exports.buildReserveTypedDataWithQuoteSource = buildReserveTypedDataWithQuoteSource;
+    exports.computeReserveDigestWithQuoteSource = computeReserveDigestWithQuoteSource;
     var ethers_1 = __require("ethers");
     var permit_types_1 = require_permit_types();
+    var witness_values_1 = require_witness_values();
     function computeReserveDigest(input) {
       const domain = (0, permit_types_1.createEscrowDomain)(input.chainId, input.escrowContract);
       return ethers_1.TypedDataEncoder.hash(domain, permit_types_1.RESERVE_WITNESS_TYPES, {
@@ -370,6 +797,114 @@ var require_reserve_encoder = __commonJS({
         settler: input.settler
       });
     }
+    function buildReserveTypedDataWithQuoteSource(input) {
+      return {
+        types: permit_types_1.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE,
+        primaryType: "ReserveWitness",
+        domain: {
+          name: "Escrow",
+          version: "3",
+          chainId: (0, witness_values_1.chainIdToHex)(input.chainId),
+          verifyingContract: (0, witness_values_1.normalizeAddressField)("escrowContract", input.escrowContract)
+        },
+        message: {
+          depositId: (0, witness_values_1.normalizeBytes32)("depositId", input.depositId),
+          quoteHash: (0, witness_values_1.normalizeBytes32)("quoteHash", input.quoteHash),
+          settler: (0, witness_values_1.normalizeAddressField)("settler", input.settler),
+          sourceAmount: (0, witness_values_1.normalizeUint256)("sourceAmount", input.sourceAmount)
+        }
+      };
+    }
+    function computeReserveDigestWithQuoteSource(input) {
+      const prehash = buildReserveTypedDataWithQuoteSource(input);
+      return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
+    }
+  }
+});
+
+// ../contracts/evm/escrow-encoding/typescript/dist/release-encoder.js
+var require_release_encoder = __commonJS({
+  "../contracts/evm/escrow-encoding/typescript/dist/release-encoder.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.buildReleaseTypedDataWithQuoteHash = buildReleaseTypedDataWithQuoteHash;
+    exports.computeReleaseDigestWithQuoteHash = computeReleaseDigestWithQuoteHash;
+    var ethers_1 = __require("ethers");
+    var permit_types_1 = require_permit_types();
+    var witness_values_1 = require_witness_values();
+    function buildReleaseTypedDataWithQuoteHash(input) {
+      const w = input.witness;
+      return {
+        types: permit_types_1.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH,
+        primaryType: "ReleaseWitness",
+        domain: {
+          name: "Escrow",
+          version: "3",
+          chainId: (0, witness_values_1.chainIdToHex)(input.chainId),
+          verifyingContract: (0, witness_values_1.normalizeAddressField)("escrowContract", input.escrowContract)
+        },
+        message: {
+          depositId: (0, witness_values_1.normalizeBytes32)("depositId", w.depositId),
+          quoteHash: (0, witness_values_1.normalizeBytes32)("quoteHash", w.quoteHash),
+          depositRequestHash: (0, witness_values_1.normalizeBytes32)("depositRequestHash", w.depositRequestHash),
+          destinationHash: (0, witness_values_1.normalizeBytes32)("destinationHash", w.destinationHash),
+          depositor: (0, witness_values_1.normalizeAddressField)("depositor", w.depositor),
+          token: (0, witness_values_1.normalizeAddressField)("token", w.token),
+          amount: (0, witness_values_1.normalizeUint256)("amount", w.amount),
+          feeAmount: (0, witness_values_1.normalizeUint256)("feeAmount", w.feeAmount),
+          reserver: (0, witness_values_1.normalizeAddressField)("reserver", w.reserver),
+          releaser: (0, witness_values_1.normalizeAddressField)("releaser", w.releaser),
+          settler: (0, witness_values_1.normalizeAddressField)("settler", w.settler)
+        }
+      };
+    }
+    function computeReleaseDigestWithQuoteHash(input) {
+      const prehash = buildReleaseTypedDataWithQuoteHash(input);
+      return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
+    }
+  }
+});
+
+// ../contracts/evm/escrow-encoding/typescript/dist/refund-encoder.js
+var require_refund_encoder = __commonJS({
+  "../contracts/evm/escrow-encoding/typescript/dist/refund-encoder.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.buildRefundTypedDataWithQuoteHash = buildRefundTypedDataWithQuoteHash;
+    exports.computeRefundDigestWithQuoteHash = computeRefundDigestWithQuoteHash;
+    var ethers_1 = __require("ethers");
+    var permit_types_1 = require_permit_types();
+    var witness_values_1 = require_witness_values();
+    function buildRefundTypedDataWithQuoteHash(input) {
+      const w = input.witness;
+      return {
+        types: permit_types_1.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH,
+        primaryType: "RefundWitness",
+        domain: {
+          name: "Escrow",
+          version: "3",
+          chainId: (0, witness_values_1.chainIdToHex)(input.chainId),
+          verifyingContract: (0, witness_values_1.normalizeAddressField)("escrowContract", input.escrowContract)
+        },
+        message: {
+          depositId: (0, witness_values_1.normalizeBytes32)("depositId", w.depositId),
+          quoteHash: (0, witness_values_1.normalizeBytes32)("quoteHash", w.quoteHash),
+          depositRequestHash: (0, witness_values_1.normalizeBytes32)("depositRequestHash", w.depositRequestHash),
+          destinationHash: (0, witness_values_1.normalizeBytes32)("destinationHash", w.destinationHash),
+          depositor: (0, witness_values_1.normalizeAddressField)("depositor", w.depositor),
+          token: (0, witness_values_1.normalizeAddressField)("token", w.token),
+          amount: (0, witness_values_1.normalizeUint256)("amount", w.amount),
+          feeAmount: (0, witness_values_1.normalizeUint256)("feeAmount", w.feeAmount),
+          reserver: (0, witness_values_1.normalizeAddressField)("reserver", w.reserver),
+          releaser: (0, witness_values_1.normalizeAddressField)("releaser", w.releaser),
+          settler: (0, witness_values_1.normalizeAddressField)("settler", w.settler)
+        }
+      };
+    }
+    function computeRefundDigestWithQuoteHash(input) {
+      const prehash = buildRefundTypedDataWithQuoteHash(input);
+      return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
+    }
   }
 });
 
@@ -378,11 +913,13 @@ var require_deposit_encoder = __commonJS({
   "../contracts/evm/escrow-encoding/typescript/dist/deposit-encoder.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.PERMIT2_CONTRACT_ADDRESS = void 0;
+    exports.MAX_DESTINATION_BYTES = exports.PERMIT2_CONTRACT_ADDRESS = void 0;
     exports.createPermitWitnessTransferFromPrehash = createPermitWitnessTransferFromPrehash;
     exports.hashPermitWitnessTransferFrom = hashPermitWitnessTransferFrom;
+    exports.createPermitWitnessTransferFromPrehashWithDestination = createPermitWitnessTransferFromPrehashWithDestination;
     var ethers_1 = __require("ethers");
     var permit_types_1 = require_permit_types();
+    var witness_values_1 = require_witness_values();
     exports.PERMIT2_CONTRACT_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
     function createPermitWitnessTransferFromPrehash(params) {
       return {
@@ -411,6 +948,43 @@ var require_deposit_encoder = __commonJS({
     function hashPermitWitnessTransferFrom(prehash) {
       return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
     }
+    exports.MAX_DESTINATION_BYTES = 256;
+    function assertDestinationWithinBounds(destination) {
+      if (destination === "") {
+        throw new Error('destination is empty: the escrow reverts DestinationCannotBeEmpty, and because keccak256("") is a valid bytes32 this would otherwise sign a commitment to no destination at all');
+      }
+      const byteLength = (0, ethers_1.toUtf8Bytes)(destination).length;
+      if (byteLength > exports.MAX_DESTINATION_BYTES) {
+        throw new Error(`destination is ${byteLength} bytes, over the escrow's MAX_DESTINATION_BYTES of ${exports.MAX_DESTINATION_BYTES}: the contract reverts DestinationTooLong, so this digest could never be redeemed`);
+      }
+    }
+    function createPermitWitnessTransferFromPrehashWithDestination(params) {
+      assertDestinationWithinBounds(params.destination);
+      return {
+        types: permit_types_1.PERMIT_WITNESS_TYPES_WITH_DESTINATION,
+        primaryType: "PermitWitnessTransferFrom",
+        domain: {
+          name: "Permit2",
+          chainId: (0, witness_values_1.chainIdToHex)(params.chainId),
+          verifyingContract: (0, witness_values_1.normalizeAddressField)("verifyingContract", params.verifyingContract)
+        },
+        message: {
+          permitted: {
+            token: (0, witness_values_1.normalizeAddressField)("token", params.token),
+            amount: (0, witness_values_1.normalizeUint256)("amount", params.amount)
+          },
+          spender: (0, witness_values_1.normalizeAddressField)("spender", params.spender),
+          nonce: (0, witness_values_1.normalizeUint256)("nonce", params.nonce),
+          deadline: (0, witness_values_1.normalizeUint256)("deadline", params.deadline),
+          witness: {
+            depositRequestHash: (0, witness_values_1.normalizeBytes32)("depositRequestHash", params.depositRequestHash),
+            destination: params.destination,
+            reserver: (0, witness_values_1.normalizeAddressField)("reserver", params.reserver),
+            releaser: (0, witness_values_1.normalizeAddressField)("releaser", params.releaser)
+          }
+        }
+      };
+    }
   }
 });
 
@@ -419,7 +993,7 @@ var require_dist = __commonJS({
   "../contracts/evm/escrow-encoding/typescript/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.PERMIT2_CONTRACT_ADDRESS = exports.hashPermitWitnessTransferFrom = exports.createPermitWitnessTransferFromPrehash = exports.computeReserveDigest = exports.ESCROW_V3_ABI_JSON = exports.ESCROW_V2_ABI_JSON = exports.ESCROW_ABI_JSON = exports.ESCROW_ABI = exports.REFUND_WITNESS_TYPES = exports.RELEASE_WITNESS_TYPES = exports.RESERVE_WITNESS_TYPES = exports.createEscrowDomain = exports.createPermit2Domain = exports.PERMIT_WITNESS_TYPES_V2 = exports.PERMIT_WITNESS_TYPES = exports.generateNonce = exports.computePaymentIdV2 = exports.computePaymentId = void 0;
+    exports.MAX_DESTINATION_BYTES = exports.createPermitWitnessTransferFromPrehashWithDestination = exports.PERMIT2_CONTRACT_ADDRESS = exports.hashPermitWitnessTransferFrom = exports.createPermitWitnessTransferFromPrehash = exports.computeRefundDigestWithQuoteHash = exports.buildRefundTypedDataWithQuoteHash = exports.computeReleaseDigestWithQuoteHash = exports.buildReleaseTypedDataWithQuoteHash = exports.computeReserveDigestWithQuoteSource = exports.buildReserveTypedDataWithQuoteSource = exports.computeReserveDigest = exports.ESCROW_V3_ABI_JSON = exports.ESCROW_V2_ABI_JSON = exports.ESCROW_ABI_JSON = exports.ESCROW_ABI = exports.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH = exports.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH = exports.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE = exports.PERMIT_WITNESS_TYPES_WITH_DESTINATION = exports.REFUND_WITNESS_TYPES = exports.RELEASE_WITNESS_TYPES = exports.RESERVE_WITNESS_TYPES = exports.createEscrowDomain = exports.createPermit2Domain = exports.PERMIT_WITNESS_TYPES_V2 = exports.PERMIT_WITNESS_TYPES = exports.generateNonce = exports.computePaymentIdV2 = exports.computePaymentId = void 0;
     var payment_id_1 = require_payment_id();
     Object.defineProperty(exports, "computePaymentId", { enumerable: true, get: function() {
       return payment_id_1.computePaymentId;
@@ -453,6 +1027,19 @@ var require_dist = __commonJS({
     Object.defineProperty(exports, "REFUND_WITNESS_TYPES", { enumerable: true, get: function() {
       return permit_types_1.REFUND_WITNESS_TYPES;
     } });
+    var permit_types_2 = require_permit_types();
+    Object.defineProperty(exports, "PERMIT_WITNESS_TYPES_WITH_DESTINATION", { enumerable: true, get: function() {
+      return permit_types_2.PERMIT_WITNESS_TYPES_WITH_DESTINATION;
+    } });
+    Object.defineProperty(exports, "RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE", { enumerable: true, get: function() {
+      return permit_types_2.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE;
+    } });
+    Object.defineProperty(exports, "RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH", { enumerable: true, get: function() {
+      return permit_types_2.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH;
+    } });
+    Object.defineProperty(exports, "REFUND_WITNESS_TYPES_WITH_QUOTE_HASH", { enumerable: true, get: function() {
+      return permit_types_2.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH;
+    } });
     var escrow_abi_1 = require_escrow_abi();
     Object.defineProperty(exports, "ESCROW_ABI", { enumerable: true, get: function() {
       return escrow_abi_1.ESCROW_ABI;
@@ -469,199 +1056,45 @@ var require_dist = __commonJS({
     var reserve_encoder_1 = require_reserve_encoder();
     Object.defineProperty(exports, "computeReserveDigest", { enumerable: true, get: function() {
       return reserve_encoder_1.computeReserveDigest;
-    } });
-    var deposit_encoder_1 = require_deposit_encoder();
-    Object.defineProperty(exports, "createPermitWitnessTransferFromPrehash", { enumerable: true, get: function() {
-      return deposit_encoder_1.createPermitWitnessTransferFromPrehash;
-    } });
-    Object.defineProperty(exports, "hashPermitWitnessTransferFrom", { enumerable: true, get: function() {
-      return deposit_encoder_1.hashPermitWitnessTransferFrom;
-    } });
-    Object.defineProperty(exports, "PERMIT2_CONTRACT_ADDRESS", { enumerable: true, get: function() {
-      return deposit_encoder_1.PERMIT2_CONTRACT_ADDRESS;
-    } });
-  }
-});
-
-// ../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/types.js
-var require_types = __commonJS({
-  "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/types.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-  }
-});
-
-// ../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/utils.js
-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.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;
-    exports.assertAmountMatches = assertAmountMatches;
-    exports.assertFresh = assertFresh;
-    exports.assertSpender = assertSpender;
-    exports.assertWitnessRoles = assertWitnessRoles;
-    exports.assertRolePairComplete = assertRolePairComplete;
-    exports.nowSec = nowSec;
-    var ethers_1 = __require("ethers");
-    exports.REPLAY_HORIZON_SECS = 128;
-    function resolvePermitDeadline(deadline) {
-      return BigInt(deadline);
-    }
-    function generatePermitNonce() {
-      const rand = new Uint32Array(1);
-      globalThis.crypto.getRandomValues(rand);
-      return (BigInt(Date.now()) << 32n) + BigInt(rand[0]);
-    }
-    function resolvePermitNonce(nonce) {
-      return BigInt(nonce);
-    }
-    exports.PERMIT_NONCE_DOMAIN = "atum-permit:v1:";
-    exports.SOLANA_REPLAY_SLOTS = 235n;
-    var SOLANA_BUCKET_BITS = 17n;
-    function canonicalDepositor(depositor) {
-      const lower = depositor.toLowerCase();
-      return lower.startsWith("0x") ? lower : depositor;
-    }
-    function permitNonceSeed(requestId, depositor) {
-      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)(`${exports.PERMIT_NONCE_DOMAIN}${requestId}:${canonicalDepositor(depositor)}`)));
-    }
-    function deterministicPermitNonce(params) {
-      return permitNonceSeed(params.requestId, params.depositor);
-    }
-    function deterministicSolanaNonce(params) {
-      const seed = permitNonceSeed(params.requestId, params.depositor);
-      const slot = seed % exports.SOLANA_REPLAY_SLOTS;
-      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();
-      }
-      return a === b;
-    }
-    function assertKeyMatchesSender(matches, sender, derived) {
-      if (!matches) {
-        throw new Error(`sender_auth: private key derives ${derived}, not the expected sender ${sender}`);
-      }
-    }
-    function assertToken(token, sourceAsset, normalize) {
-      if (!sameAddress2(token, normalize(sourceAsset))) {
-        throw new Error("sender_auth: permit token does not match the source asset");
-      }
-    }
-    function assertAmountMatches(amount, maxSourceAmount) {
-      if (BigInt(amount) !== BigInt(maxSourceAmount)) {
-        throw new Error("sender_auth: permit amount does not match max_source_amount");
-      }
-    }
-    function assertFresh(deadlineSec, nowSec2) {
-      if (deadlineSec <= nowSec2) {
-        throw new Error("sender_auth: permit deadline is not in the future");
-      }
-    }
-    function assertSpender(spender, escrow, normalize) {
-      if (!sameAddress2(spender, normalize(escrow))) {
-        throw new Error("sender_auth: permit spender is not the source escrow");
-      }
-    }
-    function assertWitnessRoles(reserver, releaser, expectedReserver, expectedReleaser, normalize) {
-      if (!sameAddress2(reserver, normalize(expectedReserver)) || !sameAddress2(releaser, normalize(expectedReleaser))) {
-        throw new Error("sender_auth: deposit witness roles do not match the challenge");
-      }
-    }
-    function assertRolePairComplete(reserver, releaser) {
-      if (reserver === void 0 !== (releaser === void 0)) {
-        throw new Error("sender_auth: reserver and releaser must be supplied together");
-      }
-    }
-    function nowSec() {
-      return Math.floor(Date.now() / 1e3);
-    }
-  }
-});
-
-// ../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/chain-id.js
-var require_chain_id = __commonJS({
-  "../schemas/declarations/PaymentRequest/v1/bindings/typescript/sender-auth/dist/chain-id.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.TRON_PERMIT2_FALLBACKS = exports.TRON_CHAIN_IDS = void 0;
-    exports.namespaceOf = namespaceOf2;
-    exports.evmChainId = evmChainId;
-    exports.tronNumericChainId = tronNumericChainId;
-    exports.resolveTronPermit2 = resolveTronPermit22;
-    exports.clusterIdFromName = clusterIdFromName;
-    function namespaceOf2(network) {
-      return network.split(":")[0];
-    }
-    function evmChainId(network) {
-      const match = /^eip155:([0-9]+)$/.exec(network);
-      if (!match) {
-        throw new Error(`sender_auth: expected an eip155 network, got ${network}`);
-      }
-      return Number(match[1]);
-    }
-    exports.TRON_CHAIN_IDS = {
-      mainnet: 728126428,
-      shasta: 2494104990
-    };
-    function tronNumericChainId(network) {
-      const cluster = network.split(":")[1];
-      const id = exports.TRON_CHAIN_IDS[cluster ?? ""];
-      if (id === void 0) {
-        throw new Error(`sender_auth: unsupported Tron network '${network}'`);
-      }
-      return id;
-    }
-    exports.TRON_PERMIT2_FALLBACKS = {
-      "tron:mainnet": "TJhMXTHQHeQyMD7TcKQFqAePNgG4b31H9m",
-      "tron:shasta": "TPUqJPASUn1zLvbLBgRZ5pBYrx7WSe5ahp"
-    };
-    function resolveTronPermit22(network) {
-      const resolved = exports.TRON_PERMIT2_FALLBACKS[network];
-      if (!resolved) {
-        throw new Error(`sender_auth: no Permit2 address known for Tron network '${network}'`);
-      }
-      return resolved;
-    }
-    function clusterIdFromName(name) {
-      const encoded = new TextEncoder().encode(name);
-      if (encoded.length > 32) {
-        throw new Error(`sender_auth: Solana cluster name too long (${encoded.length} > 32 bytes): ${name}`);
-      }
-      const out = new Uint8Array(32);
-      out.set(encoded);
-      return out;
-    }
+    } });
+    var reserve_encoder_2 = require_reserve_encoder();
+    Object.defineProperty(exports, "buildReserveTypedDataWithQuoteSource", { enumerable: true, get: function() {
+      return reserve_encoder_2.buildReserveTypedDataWithQuoteSource;
+    } });
+    Object.defineProperty(exports, "computeReserveDigestWithQuoteSource", { enumerable: true, get: function() {
+      return reserve_encoder_2.computeReserveDigestWithQuoteSource;
+    } });
+    var release_encoder_1 = require_release_encoder();
+    Object.defineProperty(exports, "buildReleaseTypedDataWithQuoteHash", { enumerable: true, get: function() {
+      return release_encoder_1.buildReleaseTypedDataWithQuoteHash;
+    } });
+    Object.defineProperty(exports, "computeReleaseDigestWithQuoteHash", { enumerable: true, get: function() {
+      return release_encoder_1.computeReleaseDigestWithQuoteHash;
+    } });
+    var refund_encoder_1 = require_refund_encoder();
+    Object.defineProperty(exports, "buildRefundTypedDataWithQuoteHash", { enumerable: true, get: function() {
+      return refund_encoder_1.buildRefundTypedDataWithQuoteHash;
+    } });
+    Object.defineProperty(exports, "computeRefundDigestWithQuoteHash", { enumerable: true, get: function() {
+      return refund_encoder_1.computeRefundDigestWithQuoteHash;
+    } });
+    var deposit_encoder_1 = require_deposit_encoder();
+    Object.defineProperty(exports, "createPermitWitnessTransferFromPrehash", { enumerable: true, get: function() {
+      return deposit_encoder_1.createPermitWitnessTransferFromPrehash;
+    } });
+    Object.defineProperty(exports, "hashPermitWitnessTransferFrom", { enumerable: true, get: function() {
+      return deposit_encoder_1.hashPermitWitnessTransferFrom;
+    } });
+    Object.defineProperty(exports, "PERMIT2_CONTRACT_ADDRESS", { enumerable: true, get: function() {
+      return deposit_encoder_1.PERMIT2_CONTRACT_ADDRESS;
+    } });
+    var deposit_encoder_2 = require_deposit_encoder();
+    Object.defineProperty(exports, "createPermitWitnessTransferFromPrehashWithDestination", { enumerable: true, get: function() {
+      return deposit_encoder_2.createPermitWitnessTransferFromPrehashWithDestination;
+    } });
+    Object.defineProperty(exports, "MAX_DESTINATION_BYTES", { enumerable: true, get: function() {
+      return deposit_encoder_2.MAX_DESTINATION_BYTES;
+    } });
   }
 });
 
@@ -704,22 +1137,23 @@ var require_evm = __commonJS({
     var ethers_1 = __require("ethers");
     var evm_escrow_encoding_1 = require_dist();
     var utils_js_1 = require_utils();
+    var destination_js_1 = require_destination();
     var errors_js_1 = require_errors();
     var chain_id_js_1 = require_chain_id();
     exports.evmAdapter = {
-      async buildAuthMessage({ sourceAsset, maxSourceAmount, sourceDefaults, deadline, nonce }) {
+      async buildAuthMessage({ sourceAsset, maxSourceAmount, requestId, sourceDefaults, destinationAsset, destinationAccount, 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. 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)");
         }
-        const sourceChainId = sourceAsset.split("/")[0];
-        const chainIdNum = parseInt(sourceChainId.split(":")[1]);
-        const tokenAddress = sourceAsset.split("/")[1].split(":")[1];
-        const permitParams = {
+        const { network: sourceChainId, asset: tokenAddress } = (0, utils_js_1.parseSourceAsset)(sourceAsset);
+        const chainIdNum = (0, chain_id_js_1.evmChainId)(sourceChainId);
+        const permit2Contract = sourceDefaults.permit2Contract ?? evm_escrow_encoding_1.PERMIT2_CONTRACT_ADDRESS;
+        const basePermit = {
           chainId: chainIdNum,
-          verifyingContract: evm_escrow_encoding_1.PERMIT2_CONTRACT_ADDRESS,
+          verifyingContract: permit2Contract,
           token: tokenAddress,
           amount: maxSourceAmount,
           spender: sourceDefaults.escrowContract,
@@ -728,7 +1162,21 @@ var require_evm = __commonJS({
           reserver: sourceDefaults.quoteSelector,
           releaser: sourceDefaults.fulfillmentVerifierAccount
         };
-        const messagePrehash = (0, evm_escrow_encoding_1.createPermitWitnessTransferFromPrehash)(permitParams);
+        if ((0, destination_js_1.usesDestinationCommitment)(sourceDefaults.depositWitnessVersion)) {
+          const permitParams = {
+            ...basePermit,
+            // The two escrow commitments. Composed here through the shared helpers rather than
+            // accepted pre-built, so this producer and the release signer cannot disagree about
+            // formatting — a disagreement the escrow cannot detect, because it stores only
+            // keccak256(bytes(destination)).
+            depositRequestHash: (0, destination_js_1.deriveDepositRequestHash)(requestId),
+            destination: (0, destination_js_1.buildEscrowDestination)(destinationAsset, destinationAccount)
+          };
+          const messagePrehash2 = (0, evm_escrow_encoding_1.createPermitWitnessTransferFromPrehashWithDestination)(permitParams);
+          const messageHash2 = (0, evm_escrow_encoding_1.hashPermitWitnessTransferFrom)(messagePrehash2);
+          return { messageScheme: "EVM_PERMIT2", messageHash: messageHash2, messagePrehash: JSON.stringify(messagePrehash2) };
+        }
+        const messagePrehash = (0, evm_escrow_encoding_1.createPermitWitnessTransferFromPrehash)(basePermit);
         const messageHash = (0, evm_escrow_encoding_1.hashPermitWitnessTransferFrom)(messagePrehash);
         return { messageScheme: "EVM_PERMIT2", messageHash, messagePrehash: JSON.stringify(messagePrehash) };
       },
@@ -761,17 +1209,31 @@ var require_evm = __commonJS({
         let msg;
         try {
           msg = JSON.parse(signed.message_prehash).message;
-          canonical = (0, evm_escrow_encoding_1.createPermitWitnessTransferFromPrehash)({
+          const base = {
             chainId: (0, chain_id_js_1.evmChainId)(source.network),
-            verifyingContract: evm_escrow_encoding_1.PERMIT2_CONTRACT_ADDRESS,
+            // The same Permit2 buildAuthMessage signed against. Taken from the VERIFIER's
+            // expectations, never from msg — the prehash is client-supplied, so reading the domain
+            // out of it would let a caller nominate its own verifying contract and have the
+            // signature check itself. Absent means canonical, matching the build side's default.
+            verifyingContract: expected.permit2Contract ?? evm_escrow_encoding_1.PERMIT2_CONTRACT_ADDRESS,
             token: msg.permitted.token,
             amount: msg.permitted.amount,
             spender: msg.spender,
             nonce: BigInt(msg.nonce),
             deadline: BigInt(msg.deadline),
-            reserver: msg.witness.reserver,
-            releaser: msg.witness.releaser
-          });
+            reserver: msg.witness?.reserver,
+            releaser: msg.witness?.releaser
+          };
+          const hasHash = typeof msg.witness?.depositRequestHash === "string";
+          const hasDestination = typeof msg.witness?.destination === "string";
+          if (hasHash !== hasDestination) {
+            throw new Error("half-populated deposit witness");
+          }
+          canonical = hasHash ? (0, evm_escrow_encoding_1.createPermitWitnessTransferFromPrehashWithDestination)({
+            ...base,
+            depositRequestHash: msg.witness.depositRequestHash,
+            destination: msg.witness.destination
+          }) : (0, evm_escrow_encoding_1.createPermitWitnessTransferFromPrehash)(base);
         } catch {
           throw new errors_js_1.MalformedPrehashError();
         }
@@ -795,6 +1257,12 @@ var require_evm = __commonJS({
         if (expected.reserver !== void 0 && expected.releaser !== void 0) {
           (0, utils_js_1.assertWitnessRoles)(msg.witness.reserver, msg.witness.releaser, expected.reserver, expected.releaser, (a) => a);
         }
+        if (expected.destination !== void 0) {
+          (0, utils_js_1.assertDestination)(msg.witness.destination, expected.destination);
+        }
+        if (expected.requestId !== void 0) {
+          (0, utils_js_1.assertDepositRequestHash)(msg.witness.depositRequestHash, expected.requestId);
+        }
         return {
           amount: msg.permitted.amount,
           deadlineSec,
@@ -805,7 +1273,11 @@ var require_evm = __commonJS({
             deadlineSec,
             reserver: msg.witness.reserver,
             releaser: msg.witness.releaser,
-            spender: msg.spender
+            spender: msg.spender,
+            // Surfaced whether or not the opt-in checks above ran, so a consumer binding these
+            // downstream does not have to re-parse message_prehash and risk drifting from this parse.
+            destination: msg.witness.destination,
+            depositRequestHash: msg.witness.depositRequestHash
           }
         };
       }
@@ -863,7 +1335,7 @@ var require_tron_address = __commonJS({
         hexAddress = base58ToHex(address);
       }
       hexAddress = hexAddress.replace(/^0x/, "");
-      if (hexAddress.startsWith(TVM_MAINNET_PREFIX)) {
+      if (hexAddress.length === 42 && hexAddress.startsWith(TVM_MAINNET_PREFIX)) {
         hexAddress = hexAddress.substring(2);
       }
       if (hexAddress.length !== 40) {
@@ -877,14 +1349,62 @@ var require_tron_address = __commonJS({
   }
 });
 
+// ../contracts/tvm/escrow-encoding/typescript/dist/witness-values.js
+var require_witness_values2 = __commonJS({
+  "../contracts/tvm/escrow-encoding/typescript/dist/witness-values.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.normalizeBytes32 = normalizeBytes32;
+    exports.normalizeUint256 = normalizeUint256;
+    exports.maskedChainIdToHex = maskedChainIdToHex;
+    var ethers_1 = __require("ethers");
+    var chain_id_1 = require_chain_id2();
+    function normalizeBytes32(label, value) {
+      let bytes;
+      try {
+        bytes = (0, ethers_1.getBytes)(value);
+      } catch {
+        throw new Error(`${label} must be 0x-prefixed hex (32 bytes), got ${JSON.stringify(value)}`);
+      }
+      if (bytes.length !== 32) {
+        throw new Error(`${label} must be exactly 32 bytes, got ${bytes.length}`);
+      }
+      return (0, ethers_1.hexlify)(bytes);
+    }
+    function normalizeUint256(label, value) {
+      let n;
+      try {
+        n = BigInt(value);
+      } catch {
+        throw new Error(`${label} must be an integer (bigint or decimal string), got ${JSON.stringify(value)}`);
+      }
+      if (n < 0n) {
+        throw new Error(`${label} must be non-negative (uint256), got ${n.toString()}`);
+      }
+      return n.toString();
+    }
+    function maskedChainIdToHex(chainId) {
+      if (!Number.isSafeInteger(chainId) || chainId < 0) {
+        throw new Error(`chainId must be a non-negative safe integer, got ${chainId}`);
+      }
+      return `0x${(0, chain_id_1.maskChainId)(chainId).toString(16)}`;
+    }
+  }
+});
+
 // ../contracts/tvm/escrow-encoding/typescript/dist/reserve-encoder.js
 var require_reserve_encoder2 = __commonJS({
   "../contracts/tvm/escrow-encoding/typescript/dist/reserve-encoder.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE = void 0;
     exports.computeReserveDigest = computeReserveDigest;
+    exports.buildTvmReserveTypedDataWithQuoteSource = buildTvmReserveTypedDataWithQuoteSource;
+    exports.computeTvmReserveDigestWithQuoteSource = computeTvmReserveDigestWithQuoteSource;
     var ethers_1 = __require("ethers");
     var chain_id_1 = require_chain_id2();
+    var tron_address_1 = require_tron_address();
+    var witness_values_1 = require_witness_values2();
     var RESERVE_WITNESS_TYPES = {
       ReserveWitness: [
         { name: "paymentId", type: "bytes32" },
@@ -903,6 +1423,36 @@ var require_reserve_encoder2 = __commonJS({
         settler: input.settler
       });
     }
+    exports.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE = {
+      ReserveWitness: [
+        { name: "depositId", type: "bytes32" },
+        { name: "quoteHash", type: "bytes32" },
+        { name: "settler", type: "address" },
+        { name: "sourceAmount", type: "uint256" }
+      ]
+    };
+    function buildTvmReserveTypedDataWithQuoteSource(input) {
+      return {
+        types: exports.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE,
+        primaryType: "ReserveWitness",
+        domain: {
+          name: "Escrow",
+          version: "3",
+          chainId: (0, witness_values_1.maskedChainIdToHex)(input.chainId),
+          verifyingContract: (0, tron_address_1.normalizeAddress)(input.escrowContract)
+        },
+        message: {
+          depositId: (0, witness_values_1.normalizeBytes32)("depositId", input.depositId),
+          quoteHash: (0, witness_values_1.normalizeBytes32)("quoteHash", input.quoteHash),
+          settler: (0, tron_address_1.normalizeAddress)(input.settler),
+          sourceAmount: (0, witness_values_1.normalizeUint256)("sourceAmount", input.sourceAmount)
+        }
+      };
+    }
+    function computeTvmReserveDigestWithQuoteSource(input) {
+      const prehash = buildTvmReserveTypedDataWithQuoteSource(input);
+      return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
+    }
   }
 });
 
@@ -929,11 +1479,14 @@ var require_deposit_encoder2 = __commonJS({
   "../contracts/tvm/escrow-encoding/typescript/dist/deposit-encoder.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MAX_DESTINATION_BYTES = exports.PERMIT_WITNESS_TYPES_WITH_DESTINATION = void 0;
     exports.createTvmPermitWitnessTransferFromPrehash = createTvmPermitWitnessTransferFromPrehash;
     exports.hashTvmPermitWitnessTransferFrom = hashTvmPermitWitnessTransferFrom;
+    exports.createTvmPermitWitnessTransferFromPrehashWithDestination = createTvmPermitWitnessTransferFromPrehashWithDestination;
     var ethers_1 = __require("ethers");
     var chain_id_1 = require_chain_id2();
     var tron_address_1 = require_tron_address();
+    var witness_values_1 = require_witness_values2();
     var PERMIT_WITNESS_TYPES_V2 = {
       PermitWitnessTransferFrom: [
         { name: "permitted", type: "TokenPermissions" },
@@ -979,6 +1532,180 @@ var require_deposit_encoder2 = __commonJS({
     function hashTvmPermitWitnessTransferFrom(prehash) {
       return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
     }
+    exports.PERMIT_WITNESS_TYPES_WITH_DESTINATION = {
+      PermitWitnessTransferFrom: [
+        { name: "permitted", type: "TokenPermissions" },
+        { name: "spender", type: "address" },
+        { name: "nonce", type: "uint256" },
+        { name: "deadline", type: "uint256" },
+        { name: "witness", type: "DepositWitness" }
+      ],
+      TokenPermissions: [
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" }
+      ],
+      DepositWitness: [
+        { name: "depositRequestHash", type: "bytes32" },
+        { name: "destination", type: "string" },
+        { name: "reserver", type: "address" },
+        { name: "releaser", type: "address" }
+      ]
+    };
+    exports.MAX_DESTINATION_BYTES = 256;
+    function assertDestinationWithinBounds(destination) {
+      if (destination === "") {
+        throw new Error('destination is empty: the escrow reverts DestinationCannotBeEmpty, and because keccak256("") is a valid bytes32 this would otherwise sign a commitment to no destination at all');
+      }
+      const byteLength = (0, ethers_1.toUtf8Bytes)(destination).length;
+      if (byteLength > exports.MAX_DESTINATION_BYTES) {
+        throw new Error(`destination is ${byteLength} bytes, over the escrow's MAX_DESTINATION_BYTES of ${exports.MAX_DESTINATION_BYTES}: the contract reverts DestinationTooLong, so this digest could never be redeemed`);
+      }
+    }
+    function createTvmPermitWitnessTransferFromPrehashWithDestination(params) {
+      assertDestinationWithinBounds(params.destination);
+      return {
+        types: exports.PERMIT_WITNESS_TYPES_WITH_DESTINATION,
+        primaryType: "PermitWitnessTransferFrom",
+        domain: {
+          name: "Permit2",
+          chainId: (0, witness_values_1.maskedChainIdToHex)(params.chainId),
+          verifyingContract: (0, tron_address_1.normalizeAddress)(params.permit2Address)
+        },
+        message: {
+          permitted: {
+            token: (0, tron_address_1.normalizeAddress)(params.tokenAddress),
+            amount: (0, witness_values_1.normalizeUint256)("amount", params.amount)
+          },
+          spender: (0, tron_address_1.normalizeAddress)(params.spenderAddress),
+          nonce: (0, witness_values_1.normalizeUint256)("nonce", params.nonce),
+          deadline: (0, witness_values_1.normalizeUint256)("deadline", params.deadline),
+          witness: {
+            depositRequestHash: (0, witness_values_1.normalizeBytes32)("depositRequestHash", params.depositRequestHash),
+            destination: params.destination,
+            reserver: (0, tron_address_1.normalizeAddress)(params.reserverAddress),
+            releaser: (0, tron_address_1.normalizeAddress)(params.releaserAddress)
+          }
+        }
+      };
+    }
+  }
+});
+
+// ../contracts/tvm/escrow-encoding/typescript/dist/release-encoder.js
+var require_release_encoder2 = __commonJS({
+  "../contracts/tvm/escrow-encoding/typescript/dist/release-encoder.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH = void 0;
+    exports.buildTvmReleaseTypedDataWithQuoteHash = buildTvmReleaseTypedDataWithQuoteHash;
+    exports.computeTvmReleaseDigestWithQuoteHash = computeTvmReleaseDigestWithQuoteHash;
+    var ethers_1 = __require("ethers");
+    var tron_address_1 = require_tron_address();
+    var witness_values_1 = require_witness_values2();
+    exports.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH = {
+      ReleaseWitness: [
+        { name: "depositId", type: "bytes32" },
+        { name: "quoteHash", type: "bytes32" },
+        { name: "depositRequestHash", type: "bytes32" },
+        { name: "destinationHash", type: "bytes32" },
+        { name: "depositor", type: "address" },
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" },
+        { name: "feeAmount", type: "uint256" },
+        { name: "reserver", type: "address" },
+        { name: "releaser", type: "address" },
+        { name: "settler", type: "address" }
+      ]
+    };
+    function buildTvmReleaseTypedDataWithQuoteHash(input) {
+      const w = input.witness;
+      return {
+        types: exports.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH,
+        primaryType: "ReleaseWitness",
+        domain: {
+          name: "Escrow",
+          version: "3",
+          chainId: (0, witness_values_1.maskedChainIdToHex)(input.chainId),
+          verifyingContract: (0, tron_address_1.normalizeAddress)(input.escrowContract)
+        },
+        message: {
+          depositId: (0, witness_values_1.normalizeBytes32)("depositId", w.depositId),
+          quoteHash: (0, witness_values_1.normalizeBytes32)("quoteHash", w.quoteHash),
+          depositRequestHash: (0, witness_values_1.normalizeBytes32)("depositRequestHash", w.depositRequestHash),
+          destinationHash: (0, witness_values_1.normalizeBytes32)("destinationHash", w.destinationHash),
+          depositor: (0, tron_address_1.normalizeAddress)(w.depositor),
+          token: (0, tron_address_1.normalizeAddress)(w.token),
+          amount: (0, witness_values_1.normalizeUint256)("amount", w.amount),
+          feeAmount: (0, witness_values_1.normalizeUint256)("feeAmount", w.feeAmount),
+          reserver: (0, tron_address_1.normalizeAddress)(w.reserver),
+          releaser: (0, tron_address_1.normalizeAddress)(w.releaser),
+          settler: (0, tron_address_1.normalizeAddress)(w.settler)
+        }
+      };
+    }
+    function computeTvmReleaseDigestWithQuoteHash(input) {
+      const prehash = buildTvmReleaseTypedDataWithQuoteHash(input);
+      return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
+    }
+  }
+});
+
+// ../contracts/tvm/escrow-encoding/typescript/dist/refund-encoder.js
+var require_refund_encoder2 = __commonJS({
+  "../contracts/tvm/escrow-encoding/typescript/dist/refund-encoder.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH = void 0;
+    exports.buildTvmRefundTypedDataWithQuoteHash = buildTvmRefundTypedDataWithQuoteHash;
+    exports.computeTvmRefundDigestWithQuoteHash = computeTvmRefundDigestWithQuoteHash;
+    var ethers_1 = __require("ethers");
+    var tron_address_1 = require_tron_address();
+    var witness_values_1 = require_witness_values2();
+    exports.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH = {
+      RefundWitness: [
+        { name: "depositId", type: "bytes32" },
+        { name: "quoteHash", type: "bytes32" },
+        { name: "depositRequestHash", type: "bytes32" },
+        { name: "destinationHash", type: "bytes32" },
+        { name: "depositor", type: "address" },
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" },
+        { name: "feeAmount", type: "uint256" },
+        { name: "reserver", type: "address" },
+        { name: "releaser", type: "address" },
+        { name: "settler", type: "address" }
+      ]
+    };
+    function buildTvmRefundTypedDataWithQuoteHash(input) {
+      const w = input.witness;
+      return {
+        types: exports.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH,
+        primaryType: "RefundWitness",
+        domain: {
+          name: "Escrow",
+          version: "3",
+          chainId: (0, witness_values_1.maskedChainIdToHex)(input.chainId),
+          verifyingContract: (0, tron_address_1.normalizeAddress)(input.escrowContract)
+        },
+        message: {
+          depositId: (0, witness_values_1.normalizeBytes32)("depositId", w.depositId),
+          quoteHash: (0, witness_values_1.normalizeBytes32)("quoteHash", w.quoteHash),
+          depositRequestHash: (0, witness_values_1.normalizeBytes32)("depositRequestHash", w.depositRequestHash),
+          destinationHash: (0, witness_values_1.normalizeBytes32)("destinationHash", w.destinationHash),
+          depositor: (0, tron_address_1.normalizeAddress)(w.depositor),
+          token: (0, tron_address_1.normalizeAddress)(w.token),
+          amount: (0, witness_values_1.normalizeUint256)("amount", w.amount),
+          feeAmount: (0, witness_values_1.normalizeUint256)("feeAmount", w.feeAmount),
+          reserver: (0, tron_address_1.normalizeAddress)(w.reserver),
+          releaser: (0, tron_address_1.normalizeAddress)(w.releaser),
+          settler: (0, tron_address_1.normalizeAddress)(w.settler)
+        }
+      };
+    }
+    function computeTvmRefundDigestWithQuoteHash(input) {
+      const prehash = buildTvmRefundTypedDataWithQuoteHash(input);
+      return ethers_1.TypedDataEncoder.hash(prehash.domain, prehash.types, prehash.message);
+    }
   }
 });
 
@@ -987,7 +1714,7 @@ var require_dist2 = __commonJS({
   "../contracts/tvm/escrow-encoding/typescript/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.hashTvmPermitWitnessTransferFrom = exports.createTvmPermitWitnessTransferFromPrehash = exports.computePaymentId = exports.computeReserveDigest = exports.normalizeAddress = exports.base58ToHex = exports.maskChainId = void 0;
+    exports.MAX_DESTINATION_BYTES = exports.createTvmPermitWitnessTransferFromPrehashWithDestination = exports.PERMIT_WITNESS_TYPES_WITH_DESTINATION = exports.computeTvmRefundDigestWithQuoteHash = exports.buildTvmRefundTypedDataWithQuoteHash = exports.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH = exports.computeTvmReleaseDigestWithQuoteHash = exports.buildTvmReleaseTypedDataWithQuoteHash = exports.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH = exports.computeTvmReserveDigestWithQuoteSource = exports.buildTvmReserveTypedDataWithQuoteSource = exports.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE = exports.hashTvmPermitWitnessTransferFrom = exports.createTvmPermitWitnessTransferFromPrehash = exports.computePaymentId = exports.computeReserveDigest = exports.normalizeAddress = exports.base58ToHex = exports.maskChainId = void 0;
     var chain_id_1 = require_chain_id2();
     Object.defineProperty(exports, "maskChainId", { enumerable: true, get: function() {
       return chain_id_1.maskChainId;
@@ -1014,6 +1741,46 @@ var require_dist2 = __commonJS({
     Object.defineProperty(exports, "hashTvmPermitWitnessTransferFrom", { enumerable: true, get: function() {
       return deposit_encoder_1.hashTvmPermitWitnessTransferFrom;
     } });
+    var reserve_encoder_2 = require_reserve_encoder2();
+    Object.defineProperty(exports, "RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE", { enumerable: true, get: function() {
+      return reserve_encoder_2.RESERVE_WITNESS_TYPES_WITH_QUOTE_SOURCE;
+    } });
+    Object.defineProperty(exports, "buildTvmReserveTypedDataWithQuoteSource", { enumerable: true, get: function() {
+      return reserve_encoder_2.buildTvmReserveTypedDataWithQuoteSource;
+    } });
+    Object.defineProperty(exports, "computeTvmReserveDigestWithQuoteSource", { enumerable: true, get: function() {
+      return reserve_encoder_2.computeTvmReserveDigestWithQuoteSource;
+    } });
+    var release_encoder_1 = require_release_encoder2();
+    Object.defineProperty(exports, "RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH", { enumerable: true, get: function() {
+      return release_encoder_1.RELEASE_WITNESS_TYPES_WITH_QUOTE_HASH;
+    } });
+    Object.defineProperty(exports, "buildTvmReleaseTypedDataWithQuoteHash", { enumerable: true, get: function() {
+      return release_encoder_1.buildTvmReleaseTypedDataWithQuoteHash;
+    } });
+    Object.defineProperty(exports, "computeTvmReleaseDigestWithQuoteHash", { enumerable: true, get: function() {
+      return release_encoder_1.computeTvmReleaseDigestWithQuoteHash;
+    } });
+    var refund_encoder_1 = require_refund_encoder2();
+    Object.defineProperty(exports, "REFUND_WITNESS_TYPES_WITH_QUOTE_HASH", { enumerable: true, get: function() {
+      return refund_encoder_1.REFUND_WITNESS_TYPES_WITH_QUOTE_HASH;
+    } });
+    Object.defineProperty(exports, "buildTvmRefundTypedDataWithQuoteHash", { enumerable: true, get: function() {
+      return refund_encoder_1.buildTvmRefundTypedDataWithQuoteHash;
+    } });
+    Object.defineProperty(exports, "computeTvmRefundDigestWithQuoteHash", { enumerable: true, get: function() {
+      return refund_encoder_1.computeTvmRefundDigestWithQuoteHash;
+    } });
+    var deposit_encoder_2 = require_deposit_encoder2();
+    Object.defineProperty(exports, "PERMIT_WITNESS_TYPES_WITH_DESTINATION", { enumerable: true, get: function() {
+      return deposit_encoder_2.PERMIT_WITNESS_TYPES_WITH_DESTINATION;
+    } });
+    Object.defineProperty(exports, "createTvmPermitWitnessTransferFromPrehashWithDestination", { enumerable: true, get: function() {
+      return deposit_encoder_2.createTvmPermitWitnessTransferFromPrehashWithDestination;
+    } });
+    Object.defineProperty(exports, "MAX_DESTINATION_BYTES", { enumerable: true, get: function() {
+      return deposit_encoder_2.MAX_DESTINATION_BYTES;
+    } });
   }
 });
 
@@ -1028,18 +1795,18 @@ var require_tron = __commonJS({
     var utils_js_1 = require_utils();
     var errors_js_1 = require_errors();
     var chain_id_js_1 = require_chain_id();
+    var destination_js_1 = require_destination();
     exports.tronAdapter = {
-      async buildAuthMessage({ sourceAsset, maxSourceAmount, sourceDefaults, deadline, nonce }) {
+      async buildAuthMessage({ sourceAsset, maxSourceAmount, requestId, sourceDefaults, destinationAsset, destinationAccount, 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. 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)");
         }
-        const sourceChainId = sourceAsset.split("/")[0];
-        const tokenAddress = sourceAsset.split("/")[1].split(":")[1];
+        const { network: sourceChainId, asset: tokenAddress } = (0, utils_js_1.parseSourceAsset)(sourceAsset);
         const permit2Address = sourceDefaults.permit2Contract ?? (0, chain_id_js_1.resolveTronPermit2)(sourceChainId);
-        const tvmParams = {
+        const baseParams = {
           chainId: (0, chain_id_js_1.tronNumericChainId)(sourceChainId),
           permit2Address,
           tokenAddress,
@@ -1050,7 +1817,21 @@ var require_tron = __commonJS({
           reserverAddress: sourceDefaults.quoteSelector,
           releaserAddress: sourceDefaults.fulfillmentVerifierAccount
         };
-        const messagePrehash = (0, tvm_escrow_encoding_1.createTvmPermitWitnessTransferFromPrehash)(tvmParams);
+        if ((0, destination_js_1.usesDestinationCommitment)(sourceDefaults.depositWitnessVersion)) {
+          const tvmParams = {
+            ...baseParams,
+            // The two commitments, composed through the shared helpers rather than accepted
+            // pre-built, so this producer and the Go release signer cannot disagree about
+            // formatting — a disagreement the escrow cannot detect, because it stores only
+            // keccak256(bytes(destination)).
+            depositRequestHash: (0, destination_js_1.deriveDepositRequestHash)(requestId),
+            destination: (0, destination_js_1.buildEscrowDestination)(destinationAsset, destinationAccount)
+          };
+          const messagePrehash2 = (0, tvm_escrow_encoding_1.createTvmPermitWitnessTransferFromPrehashWithDestination)(tvmParams);
+          const messageHash2 = (0, tvm_escrow_encoding_1.hashTvmPermitWitnessTransferFrom)(messagePrehash2);
+          return { messageScheme: "EVM_PERMIT2", messageHash: messageHash2, messagePrehash: JSON.stringify(messagePrehash2) };
+        }
+        const messagePrehash = (0, tvm_escrow_encoding_1.createTvmPermitWitnessTransferFromPrehash)(baseParams);
         const messageHash = (0, tvm_escrow_encoding_1.hashTvmPermitWitnessTransferFrom)(messagePrehash);
         return { messageScheme: "EVM_PERMIT2", messageHash, messagePrehash: JSON.stringify(messagePrehash) };
       },
@@ -1085,17 +1866,31 @@ var require_tron = __commonJS({
         let digest;
         try {
           msg = JSON.parse(signed.message_prehash).message;
-          const canonical = (0, tvm_escrow_encoding_1.createTvmPermitWitnessTransferFromPrehash)({
+          const base = {
             chainId: (0, chain_id_js_1.tronNumericChainId)(source.network),
-            permit2Address: (0, chain_id_js_1.resolveTronPermit2)(source.network),
+            // The same Permit2 buildAuthMessage signed against, taken from the VERIFIER's
+            // expectations rather than from msg — the prehash is payer-supplied, so reading the
+            // domain out of it would let a caller nominate its own verifying contract. Absent means
+            // the pinned per-chain address, matching the build side's default.
+            permit2Address: expected.permit2Contract ?? (0, chain_id_js_1.resolveTronPermit2)(source.network),
             tokenAddress: msg.permitted.token,
             amount: msg.permitted.amount,
             spenderAddress: msg.spender,
             nonce: BigInt(msg.nonce),
             deadline: BigInt(msg.deadline),
-            reserverAddress: msg.witness.reserver,
-            releaserAddress: msg.witness.releaser
-          });
+            reserverAddress: msg.witness?.reserver,
+            releaserAddress: msg.witness?.releaser
+          };
+          const hasHash = typeof msg.witness?.depositRequestHash === "string";
+          const hasDestination = typeof msg.witness?.destination === "string";
+          if (hasHash !== hasDestination) {
+            throw new Error("half-populated witness");
+          }
+          const canonical = hasHash ? (0, tvm_escrow_encoding_1.createTvmPermitWitnessTransferFromPrehashWithDestination)({
+            ...base,
+            depositRequestHash: msg.witness.depositRequestHash,
+            destination: msg.witness.destination
+          }) : (0, tvm_escrow_encoding_1.createTvmPermitWitnessTransferFromPrehash)(base);
           digest = (0, tvm_escrow_encoding_1.hashTvmPermitWitnessTransferFrom)(canonical);
         } catch {
           throw new errors_js_1.MalformedPrehashError();
@@ -1143,7 +1938,7 @@ var require_errors2 = __commonJS({
   "../contracts/svm/escrow-encoding/typescript/dist/errors.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.InvalidHexError = exports.InvalidBase58Error = exports.InvalidPubkeyLengthError = exports.ZeroDepositHashError = exports.ZeroRecipientError = exports.ZeroReleaserError = exports.ZeroReserverError = exports.ZeroAmountError = exports.ZeroMintError = exports.ZeroDepositorError = exports.ZeroPaymentIdError = exports.EncodingError = void 0;
+    exports.InvalidEscrowDomainError = exports.DestinationTooLongError = exports.EmptyDestinationError = exports.ZeroSourceAmountError = exports.ZeroQuoteHashError = exports.InvalidHexError = exports.InvalidBase58Error = exports.InvalidPubkeyLengthError = exports.ZeroDepositHashError = exports.ZeroRecipientError = exports.ZeroReleaserError = exports.ZeroReserverError = exports.ZeroAmountError = exports.ZeroMintError = exports.ZeroDepositorError = exports.ZeroDepositRequestHashError = exports.EncodingError = void 0;
     var EncodingError = class extends Error {
       constructor(message) {
         super(message);
@@ -1151,13 +1946,13 @@ var require_errors2 = __commonJS({
       }
     };
     exports.EncodingError = EncodingError;
-    var ZeroPaymentIdError = class extends EncodingError {
+    var ZeroDepositRequestHashError = class extends EncodingError {
       constructor() {
-        super("payment ID cannot be zero");
-        this.name = "ZeroPaymentIdError";
+        super("deposit request hash cannot be zero");
+        this.name = "ZeroDepositRequestHashError";
       }
     };
-    exports.ZeroPaymentIdError = ZeroPaymentIdError;
+    exports.ZeroDepositRequestHashError = ZeroDepositRequestHashError;
     var ZeroDepositorError = class extends EncodingError {
       constructor() {
         super("depositor cannot be zero");
@@ -1228,6 +2023,41 @@ var require_errors2 = __commonJS({
       }
     };
     exports.InvalidHexError = InvalidHexError;
+    var ZeroQuoteHashError = class extends EncodingError {
+      constructor() {
+        super("quote hash cannot be zero");
+        this.name = "ZeroQuoteHashError";
+      }
+    };
+    exports.ZeroQuoteHashError = ZeroQuoteHashError;
+    var ZeroSourceAmountError = class extends EncodingError {
+      constructor() {
+        super("source amount cannot be zero");
+        this.name = "ZeroSourceAmountError";
+      }
+    };
+    exports.ZeroSourceAmountError = ZeroSourceAmountError;
+    var EmptyDestinationError = class extends EncodingError {
+      constructor() {
+        super("destination cannot be empty");
+        this.name = "EmptyDestinationError";
+      }
+    };
+    exports.EmptyDestinationError = EmptyDestinationError;
+    var DestinationTooLongError = class extends EncodingError {
+      constructor() {
+        super("destination exceeds the maximum length");
+        this.name = "DestinationTooLongError";
+      }
+    };
+    exports.DestinationTooLongError = DestinationTooLongError;
+    var InvalidEscrowDomainError = class extends EncodingError {
+      constructor(message) {
+        super(message);
+        this.name = "InvalidEscrowDomainError";
+      }
+    };
+    exports.InvalidEscrowDomainError = InvalidEscrowDomainError;
   }
 });
 
@@ -1936,12 +2766,17 @@ var require_escrow_domain = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.escrowDomainPrefixBytes = escrowDomainPrefixBytes;
+    exports.newEscrowDomain = newEscrowDomain;
+    var errors_1 = require_errors2();
     function escrowDomainPrefixBytes(domain) {
       if (domain.clusterId.length !== 32) {
-        throw new Error(`EscrowDomain.clusterId must be 32 bytes, got ${domain.clusterId.length}`);
+        throw new errors_1.InvalidEscrowDomainError(`EscrowDomain.clusterId must be 32 bytes, got ${domain.clusterId.length}`);
+      }
+      if (domain.programId.isZero()) {
+        throw new errors_1.InvalidEscrowDomainError("EscrowDomain.programId cannot be zero");
       }
       if (!Number.isInteger(domain.signatureDomainVersion) || domain.signatureDomainVersion < 1 || domain.signatureDomainVersion > 255) {
-        throw new Error(`EscrowDomain.signatureDomainVersion must be an integer in 1..=255, got ${domain.signatureDomainVersion}`);
+        throw new errors_1.InvalidEscrowDomainError(`EscrowDomain.signatureDomainVersion must be an integer in 1..=255, got ${domain.signatureDomainVersion}`);
       }
       return [
         new TextEncoder().encode("escrow"),
@@ -1950,6 +2785,25 @@ var require_escrow_domain = __commonJS({
         domain.programId.toBytes()
       ];
     }
+    function newEscrowDomain(clusterName, signatureDomainVersion, programId) {
+      const trimmed = clusterName.trim();
+      if (trimmed.length === 0) {
+        throw new errors_1.InvalidEscrowDomainError("EscrowDomain cluster name cannot be empty");
+      }
+      const encoded = new TextEncoder().encode(trimmed);
+      if (encoded.length > 32) {
+        throw new errors_1.InvalidEscrowDomainError(`EscrowDomain cluster name "${trimmed}" exceeds 32 bytes`);
+      }
+      if (!Number.isInteger(signatureDomainVersion) || signatureDomainVersion < 1 || signatureDomainVersion > 255) {
+        throw new errors_1.InvalidEscrowDomainError(`EscrowDomain.signatureDomainVersion must be an integer in 1..=255, got ${signatureDomainVersion}`);
+      }
+      if (programId.isZero()) {
+        throw new errors_1.InvalidEscrowDomainError("EscrowDomain.programId cannot be zero");
+      }
+      const clusterId = new Uint8Array(32);
+      clusterId.set(encoded);
+      return { clusterId, signatureDomainVersion, programId };
+    }
   }
 });
 
@@ -1958,13 +2812,36 @@ var require_deposit_encoder3 = __commonJS({
   "../contracts/svm/escrow-encoding/typescript/dist/deposit-encoder.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.MAX_DESTINATION_LEN = void 0;
     exports.computeDepositHash = computeDepositHash;
+    exports.computeDestinationHash = computeDestinationHash;
+    exports.computeDepositHashV2 = computeDepositHashV2;
     var encoding_utils_1 = require_encoding_utils();
     var escrow_domain_1 = require_escrow_domain();
     var errors_1 = require_errors2();
     function computeDepositHash(params, domain) {
-      if (params.paymentId.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(params.paymentId)) {
-        throw new errors_1.ZeroPaymentIdError();
+      if (params.depositRequestHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(params.depositRequestHash)) {
+        throw new errors_1.ZeroDepositRequestHashError();
+      }
+      if (params.depositor.isZero())
+        throw new errors_1.ZeroDepositorError();
+      if (params.mint.isZero())
+        throw new errors_1.ZeroMintError();
+      if (params.amount === 0n)
+        throw new errors_1.ZeroAmountError();
+      if (params.reserver.isZero())
+        throw new errors_1.ZeroReserverError();
+      if (params.releaser.isZero())
+        throw new errors_1.ZeroReleaserError();
+      return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("deposit"), params.depositRequestHash, params.depositor.toBytes(), params.mint.toBytes(), (0, encoding_utils_1.encodeU64LE)(params.amount), params.reserver.toBytes(), params.releaser.toBytes(), (0, encoding_utils_1.encodeU64LE)(params.nonce), (0, encoding_utils_1.encodeU64LE)(params.issuedAt), (0, encoding_utils_1.encodeU64LE)(params.deadline));
+    }
+    exports.MAX_DESTINATION_LEN = 256;
+    function computeDestinationHash(destination) {
+      return (0, encoding_utils_1.keccak256)((0, encoding_utils_1.stringToBytes)(destination));
+    }
+    function computeDepositHashV2(params, destination, domain) {
+      if (params.depositRequestHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(params.depositRequestHash)) {
+        throw new errors_1.ZeroDepositRequestHashError();
       }
       if (params.depositor.isZero())
         throw new errors_1.ZeroDepositorError();
@@ -1976,7 +2853,28 @@ var require_deposit_encoder3 = __commonJS({
         throw new errors_1.ZeroReserverError();
       if (params.releaser.isZero())
         throw new errors_1.ZeroReleaserError();
-      return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("deposit"), params.paymentId, params.depositor.toBytes(), params.mint.toBytes(), (0, encoding_utils_1.encodeU64LE)(params.amount), params.reserver.toBytes(), params.releaser.toBytes(), (0, encoding_utils_1.encodeU64LE)(params.nonce), (0, encoding_utils_1.encodeU64LE)(params.issuedAt), (0, encoding_utils_1.encodeU64LE)(params.deadline));
+      if (destination.length === 0)
+        throw new errors_1.EmptyDestinationError();
+      if ((0, encoding_utils_1.stringToBytes)(destination).length > exports.MAX_DESTINATION_LEN) {
+        throw new errors_1.DestinationTooLongError();
+      }
+      return (0, encoding_utils_1.keccak256)(
+        ...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain),
+        (0, encoding_utils_1.stringToBytes)("deposit"),
+        params.depositRequestHash,
+        // Hash first: keccak256 concatenates without length prefixes, so injectivity depends on every
+        // hashed field being fixed-width. Feeding the raw string would make it conditional on the
+        // surrounding widths and diverge from the on-chain program, which hashes it too.
+        computeDestinationHash(destination),
+        params.depositor.toBytes(),
+        params.mint.toBytes(),
+        (0, encoding_utils_1.encodeU64LE)(params.amount),
+        params.reserver.toBytes(),
+        params.releaser.toBytes(),
+        (0, encoding_utils_1.encodeU64LE)(params.nonce),
+        (0, encoding_utils_1.encodeU64LE)(params.issuedAt),
+        (0, encoding_utils_1.encodeU64LE)(params.deadline)
+      );
     }
   }
 });
@@ -1987,6 +2885,8 @@ var require_reserve_encoder3 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.computeReserveHash = computeReserveHash;
+    exports.computeReserveHashV2 = computeReserveHashV2;
+    exports.computeReserveHashV3 = computeReserveHashV3;
     var encoding_utils_1 = require_encoding_utils();
     var escrow_domain_1 = require_escrow_domain();
     var errors_1 = require_errors2();
@@ -1998,15 +2898,38 @@ var require_reserve_encoder3 = __commonJS({
         throw new errors_1.ZeroRecipientError();
       return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("reserve"), params.recipient.toBytes(), params.depositHash);
     }
+    function computeReserveHashV2(params, quoteHash, domain) {
+      if (params.depositHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(params.depositHash)) {
+        throw new errors_1.ZeroDepositHashError();
+      }
+      if (params.recipient.isZero())
+        throw new errors_1.ZeroRecipientError();
+      if (quoteHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(quoteHash))
+        throw new errors_1.ZeroQuoteHashError();
+      return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("reserve"), params.recipient.toBytes(), params.depositHash, quoteHash);
+    }
+    function computeReserveHashV3(params, quoteHash, sourceAmount, domain) {
+      if (params.depositHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(params.depositHash)) {
+        throw new errors_1.ZeroDepositHashError();
+      }
+      if (params.recipient.isZero())
+        throw new errors_1.ZeroRecipientError();
+      if (quoteHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(quoteHash))
+        throw new errors_1.ZeroQuoteHashError();
+      if (sourceAmount === 0n)
+        throw new errors_1.ZeroSourceAmountError();
+      return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("reserve"), params.recipient.toBytes(), params.depositHash, quoteHash, (0, encoding_utils_1.encodeU64LE)(sourceAmount));
+    }
   }
 });
 
 // ../contracts/svm/escrow-encoding/typescript/dist/release-encoder.js
-var require_release_encoder = __commonJS({
+var require_release_encoder3 = __commonJS({
   "../contracts/svm/escrow-encoding/typescript/dist/release-encoder.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.computeReleaseHash = computeReleaseHash;
+    exports.computeReleaseHashV2 = computeReleaseHashV2;
     var encoding_utils_1 = require_encoding_utils();
     var escrow_domain_1 = require_escrow_domain();
     var errors_1 = require_errors2();
@@ -2016,15 +2939,22 @@ var require_release_encoder = __commonJS({
       }
       return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("release"), params.depositHash);
     }
+    function computeReleaseHashV2(params, quoteHash, domain) {
+      if (params.depositHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(params.depositHash)) {
+        throw new errors_1.ZeroDepositHashError();
+      }
+      return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("release"), params.depositHash, quoteHash);
+    }
   }
 });
 
 // ../contracts/svm/escrow-encoding/typescript/dist/refund-encoder.js
-var require_refund_encoder = __commonJS({
+var require_refund_encoder3 = __commonJS({
   "../contracts/svm/escrow-encoding/typescript/dist/refund-encoder.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.computeRefundHash = computeRefundHash;
+    exports.computeRefundHashV2 = computeRefundHashV2;
     var encoding_utils_1 = require_encoding_utils();
     var escrow_domain_1 = require_escrow_domain();
     var errors_1 = require_errors2();
@@ -2034,6 +2964,12 @@ var require_refund_encoder = __commonJS({
       }
       return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("refund"), params.depositHash);
     }
+    function computeRefundHashV2(params, quoteHash, domain) {
+      if (params.depositHash.length !== 32 || (0, encoding_utils_1.isZeroBytes32)(params.depositHash)) {
+        throw new errors_1.ZeroDepositHashError();
+      }
+      return (0, encoding_utils_1.keccak256)(...(0, escrow_domain_1.escrowDomainPrefixBytes)(domain), (0, encoding_utils_1.stringToBytes)("refund"), params.depositHash, quoteHash);
+    }
   }
 });
 
@@ -2042,16 +2978,16 @@ var require_nonce_generator2 = __commonJS({
   "../contracts/svm/escrow-encoding/typescript/dist/nonce-generator.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.MAX_VALID_SLOT = exports.REPLAY_SLOTS = void 0;
+    exports.REPLAY_BUCKETS = exports.MAX_VALID_SLOT = exports.REPLAY_SLOTS = exports.DEPOSIT_COMPUTE_UNIT_LIMIT = void 0;
     exports.generateNonce = generateNonce;
     var crypto_1 = __require("crypto");
+    exports.DEPOSIT_COMPUTE_UNIT_LIMIT = 4e5;
     exports.REPLAY_SLOTS = 235;
     exports.MAX_VALID_SLOT = exports.REPLAY_SLOTS - 1;
-    var NONCE_BUCKET_MASK = 131071;
+    exports.REPLAY_BUCKETS = 256;
     var NONCE_BUCKET_SHIFT = 32n;
     function generateNonce() {
-      const bucketBytes = (0, crypto_1.randomBytes)(4);
-      const bucketID = bucketBytes.readUInt32LE(0) & NONCE_BUCKET_MASK;
+      const bucketID = (0, crypto_1.randomBytes)(4).readUInt32LE(0) % exports.REPLAY_BUCKETS;
       let slot;
       do {
         slot = (0, crypto_1.randomBytes)(1)[0];
@@ -2066,7 +3002,7 @@ var require_dist3 = __commonJS({
   "../contracts/svm/escrow-encoding/typescript/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.MAX_VALID_SLOT = exports.REPLAY_SLOTS = exports.generateNonce = exports.computeRefundHash = exports.computeReleaseHash = exports.computeReserveHash = exports.computeDepositHash = exports.InvalidHexError = exports.InvalidBase58Error = exports.InvalidPubkeyLengthError = exports.ZeroDepositHashError = exports.ZeroRecipientError = exports.ZeroReleaserError = exports.ZeroReserverError = exports.ZeroAmountError = exports.ZeroMintError = exports.ZeroDepositorError = exports.ZeroPaymentIdError = exports.EncodingError = exports.escrowDomainPrefixBytes = exports.isZeroBytes32 = exports.stringToBytes = exports.keccak256 = exports.encodeU64LE = exports.Pubkey = void 0;
+    exports.DEPOSIT_COMPUTE_UNIT_LIMIT = exports.REPLAY_BUCKETS = exports.MAX_VALID_SLOT = exports.REPLAY_SLOTS = exports.generateNonce = exports.computeRefundHashV2 = exports.computeRefundHash = exports.computeReleaseHashV2 = exports.computeReleaseHash = exports.computeReserveHashV3 = exports.computeReserveHashV2 = exports.computeReserveHash = exports.MAX_DESTINATION_LEN = exports.computeDestinationHash = exports.computeDepositHashV2 = exports.computeDepositHash = exports.InvalidHexError = exports.InvalidBase58Error = exports.InvalidPubkeyLengthError = exports.InvalidEscrowDomainError = exports.ZeroSourceAmountError = exports.ZeroDepositHashError = exports.ZeroRecipientError = exports.ZeroReleaserError = exports.ZeroReserverError = exports.ZeroAmountError = exports.ZeroMintError = exports.ZeroDepositorError = exports.DestinationTooLongError = exports.EmptyDestinationError = exports.ZeroQuoteHashError = exports.ZeroDepositRequestHashError = exports.EncodingError = exports.newEscrowDomain = exports.escrowDomainPrefixBytes = exports.isZeroBytes32 = exports.stringToBytes = exports.keccak256 = exports.encodeU64LE = exports.Pubkey = void 0;
     var pubkey_1 = require_pubkey();
     Object.defineProperty(exports, "Pubkey", { enumerable: true, get: function() {
       return pubkey_1.Pubkey;
@@ -2088,12 +3024,24 @@ var require_dist3 = __commonJS({
     Object.defineProperty(exports, "escrowDomainPrefixBytes", { enumerable: true, get: function() {
       return escrow_domain_1.escrowDomainPrefixBytes;
     } });
+    Object.defineProperty(exports, "newEscrowDomain", { enumerable: true, get: function() {
+      return escrow_domain_1.newEscrowDomain;
+    } });
     var errors_1 = require_errors2();
     Object.defineProperty(exports, "EncodingError", { enumerable: true, get: function() {
       return errors_1.EncodingError;
     } });
-    Object.defineProperty(exports, "ZeroPaymentIdError", { enumerable: true, get: function() {
-      return errors_1.ZeroPaymentIdError;
+    Object.defineProperty(exports, "ZeroDepositRequestHashError", { enumerable: true, get: function() {
+      return errors_1.ZeroDepositRequestHashError;
+    } });
+    Object.defineProperty(exports, "ZeroQuoteHashError", { enumerable: true, get: function() {
+      return errors_1.ZeroQuoteHashError;
+    } });
+    Object.defineProperty(exports, "EmptyDestinationError", { enumerable: true, get: function() {
+      return errors_1.EmptyDestinationError;
+    } });
+    Object.defineProperty(exports, "DestinationTooLongError", { enumerable: true, get: function() {
+      return errors_1.DestinationTooLongError;
     } });
     Object.defineProperty(exports, "ZeroDepositorError", { enumerable: true, get: function() {
       return errors_1.ZeroDepositorError;
@@ -2116,6 +3064,12 @@ var require_dist3 = __commonJS({
     Object.defineProperty(exports, "ZeroDepositHashError", { enumerable: true, get: function() {
       return errors_1.ZeroDepositHashError;
     } });
+    Object.defineProperty(exports, "ZeroSourceAmountError", { enumerable: true, get: function() {
+      return errors_1.ZeroSourceAmountError;
+    } });
+    Object.defineProperty(exports, "InvalidEscrowDomainError", { enumerable: true, get: function() {
+      return errors_1.InvalidEscrowDomainError;
+    } });
     Object.defineProperty(exports, "InvalidPubkeyLengthError", { enumerable: true, get: function() {
       return errors_1.InvalidPubkeyLengthError;
     } });
@@ -2129,18 +3083,39 @@ var require_dist3 = __commonJS({
     Object.defineProperty(exports, "computeDepositHash", { enumerable: true, get: function() {
       return deposit_encoder_1.computeDepositHash;
     } });
+    Object.defineProperty(exports, "computeDepositHashV2", { enumerable: true, get: function() {
+      return deposit_encoder_1.computeDepositHashV2;
+    } });
+    Object.defineProperty(exports, "computeDestinationHash", { enumerable: true, get: function() {
+      return deposit_encoder_1.computeDestinationHash;
+    } });
+    Object.defineProperty(exports, "MAX_DESTINATION_LEN", { enumerable: true, get: function() {
+      return deposit_encoder_1.MAX_DESTINATION_LEN;
+    } });
     var reserve_encoder_1 = require_reserve_encoder3();
     Object.defineProperty(exports, "computeReserveHash", { enumerable: true, get: function() {
       return reserve_encoder_1.computeReserveHash;
     } });
-    var release_encoder_1 = require_release_encoder();
+    Object.defineProperty(exports, "computeReserveHashV2", { enumerable: true, get: function() {
+      return reserve_encoder_1.computeReserveHashV2;
+    } });
+    Object.defineProperty(exports, "computeReserveHashV3", { enumerable: true, get: function() {
+      return reserve_encoder_1.computeReserveHashV3;
+    } });
+    var release_encoder_1 = require_release_encoder3();
     Object.defineProperty(exports, "computeReleaseHash", { enumerable: true, get: function() {
       return release_encoder_1.computeReleaseHash;
     } });
-    var refund_encoder_1 = require_refund_encoder();
+    Object.defineProperty(exports, "computeReleaseHashV2", { enumerable: true, get: function() {
+      return release_encoder_1.computeReleaseHashV2;
+    } });
+    var refund_encoder_1 = require_refund_encoder3();
     Object.defineProperty(exports, "computeRefundHash", { enumerable: true, get: function() {
       return refund_encoder_1.computeRefundHash;
     } });
+    Object.defineProperty(exports, "computeRefundHashV2", { enumerable: true, get: function() {
+      return refund_encoder_1.computeRefundHashV2;
+    } });
     var nonce_generator_1 = require_nonce_generator2();
     Object.defineProperty(exports, "generateNonce", { enumerable: true, get: function() {
       return nonce_generator_1.generateNonce;
@@ -2151,6 +3126,12 @@ var require_dist3 = __commonJS({
     Object.defineProperty(exports, "MAX_VALID_SLOT", { enumerable: true, get: function() {
       return nonce_generator_1.MAX_VALID_SLOT;
     } });
+    Object.defineProperty(exports, "REPLAY_BUCKETS", { enumerable: true, get: function() {
+      return nonce_generator_1.REPLAY_BUCKETS;
+    } });
+    Object.defineProperty(exports, "DEPOSIT_COMPUTE_UNIT_LIMIT", { enumerable: true, get: function() {
+      return nonce_generator_1.DEPOSIT_COMPUTE_UNIT_LIMIT;
+    } });
   }
 });
 
@@ -2167,6 +3148,7 @@ var require_solana = __commonJS({
     var tweetnacl_1 = __importDefault(__require("tweetnacl"));
     var bs58_1 = __importDefault(__require("bs58"));
     var solana_escrow_encoding_1 = require_dist3();
+    var destination_js_1 = require_destination();
     var utils_js_1 = require_utils();
     var errors_js_1 = require_errors();
     var chain_id_js_1 = require_chain_id();
@@ -2176,7 +3158,8 @@ var require_solana = __commonJS({
     }
     function hashDeposit(prehash, domain) {
       return (0, ethers_1.hexlify)((0, solana_escrow_encoding_1.computeDepositHash)({
-        paymentId: (0, ethers_1.getBytes)(prehash.payment_id),
+        // The encoder field was renamed for cross-VM parity; the prehash WIRE key stays payment_id.
+        depositRequestHash: (0, ethers_1.getBytes)(prehash.payment_id),
         depositor: solana_escrow_encoding_1.Pubkey.fromBase58(prehash.depositor),
         mint: solana_escrow_encoding_1.Pubkey.fromBase58(prehash.mint),
         amount: BigInt(prehash.amount),
@@ -2187,6 +3170,26 @@ var require_solana = __commonJS({
         deadline: BigInt(prehash.deadline)
       }, domain));
     }
+    var SVM_DESTINATION_COMMITMENT_VERSION = 4;
+    function hashDepositV2(prehash, domain) {
+      return (0, ethers_1.hexlify)((0, solana_escrow_encoding_1.computeDepositHashV2)(
+        {
+          depositRequestHash: (0, ethers_1.getBytes)(prehash.deposit_request_hash),
+          depositor: solana_escrow_encoding_1.Pubkey.fromBase58(prehash.depositor),
+          mint: solana_escrow_encoding_1.Pubkey.fromBase58(prehash.mint),
+          amount: BigInt(prehash.amount),
+          reserver: solana_escrow_encoding_1.Pubkey.fromBase58(prehash.reserver),
+          releaser: solana_escrow_encoding_1.Pubkey.fromBase58(prehash.releaser),
+          nonce: BigInt(prehash.nonce),
+          issuedAt: BigInt(prehash.issued_at),
+          deadline: BigInt(prehash.deadline)
+        },
+        // Plaintext, NOT pre-hashed: the encoder hashes it, and hashing an already-hashed
+        // destination yields a well-formed commitment no on-chain state can satisfy.
+        prehash.destination,
+        domain
+      ));
+    }
     function domainFrom(defaults) {
       if (!defaults.escrowContract) {
         throw new Error("sender_auth: Solana source requires escrowContract (escrow program id) for the deposit-hash domain");
@@ -2201,12 +3204,11 @@ var require_solana = __commonJS({
       };
     }
     exports.solanaAdapter = {
-      async buildAuthMessage({ sourceAsset, depositor, maxSourceAmount, requestId, sourceDefaults, nonce, solanaClockReader }) {
+      async buildAuthMessage({ sourceAsset, depositor, maxSourceAmount, requestId, sourceDefaults, destinationAsset, destinationAccount, nonce, solanaClockReader }) {
         if (!requestId) {
           throw new Error("sender_auth: request_id is required");
         }
-        const sourceChainId = sourceAsset.split("/")[0];
-        const tokenMint = sourceAsset.split("/")[1].split(":")[1];
+        const { network: sourceChainId, asset: tokenMint } = (0, utils_js_1.parseSourceAsset)(sourceAsset);
         const depositNonce = nonce !== void 0 ? BigInt(nonce) : (0, solana_escrow_encoding_1.generateNonce)();
         if (nonce !== void 0) {
           if (depositNonce < 0n || depositNonce >= 1n << 64n) {
@@ -2219,8 +3221,8 @@ var require_solana = __commonJS({
         const issuedAt = solanaClockReader ? await solanaClockReader(sourceChainId) : BigInt(Math.floor(Date.now() / 1e3));
         const deadline = issuedAt + BigInt(utils_js_1.REPLAY_HORIZON_SECS - 8);
         const paymentId = generateSolanaPaymentIdV3(requestId);
-        const prehash = {
-          payment_id: paymentId,
+        const domain = domainFrom(sourceDefaults);
+        const common = {
           depositor,
           mint: tokenMint,
           amount: BigInt(maxSourceAmount).toString(),
@@ -2230,7 +3232,20 @@ var require_solana = __commonJS({
           issued_at: issuedAt.toString(),
           deadline: deadline.toString()
         };
-        const depositHash = hashDeposit(prehash, domainFrom(sourceDefaults));
+        if (domain.signatureDomainVersion >= SVM_DESTINATION_COMMITMENT_VERSION) {
+          const prehashV2 = {
+            deposit_request_hash: paymentId,
+            destination: (0, destination_js_1.buildEscrowDestination)(destinationAsset, destinationAccount),
+            ...common
+          };
+          return {
+            messageScheme: "SOLANA",
+            messageHash: hashDepositV2(prehashV2, domain),
+            messagePrehash: JSON.stringify(prehashV2)
+          };
+        }
+        const prehash = { payment_id: paymentId, ...common };
+        const depositHash = hashDeposit(prehash, domain);
         return { messageScheme: "SOLANA", messageHash: depositHash, messagePrehash: JSON.stringify(prehash) };
       },
       async sign(signedMessage, privateKey) {
@@ -2276,8 +3291,18 @@ var require_solana = __commonJS({
         let prehash;
         let canonicalHash;
         try {
-          prehash = JSON.parse(signed.message_prehash);
-          canonicalHash = hashDeposit(prehash, domainFrom(expected));
+          const domain = domainFrom(expected);
+          if (domain.signatureDomainVersion >= SVM_DESTINATION_COMMITMENT_VERSION) {
+            const v2 = JSON.parse(signed.message_prehash);
+            if (typeof v2.deposit_request_hash !== "string" || typeof v2.destination !== "string") {
+              throw new Error("pre-widening V1 prehash on a destination-committing domain");
+            }
+            canonicalHash = hashDepositV2(v2, domain);
+            prehash = { payment_id: v2.deposit_request_hash, ...v2 };
+          } else {
+            prehash = JSON.parse(signed.message_prehash);
+            canonicalHash = hashDeposit(prehash, domain);
+          }
         } catch {
           throw new errors_js_1.MalformedPrehashError();
         }
@@ -2369,14 +3394,7 @@ var require_verify = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.verifyPaymentRequest = verifyPaymentRequest;
     var index_js_1 = require_adapters();
-    function parseSourceAsset(assetIdentifier2) {
-      const parts = assetIdentifier2.split("/");
-      const nsParts = parts[1]?.split(":");
-      if (parts.length < 2 || !nsParts || nsParts.length < 2 || !nsParts[1]) {
-        throw new Error(`sender_auth: invalid source asset "${assetIdentifier2}"`);
-      }
-      return { network: parts[0], asset: nsParts[1] };
-    }
+    var utils_js_1 = require_utils();
     function verifyPaymentRequest(request, expected = {}) {
       const senderAuth = request.sender_auth;
       if (!senderAuth?.signed_messages?.length) {
@@ -2385,7 +3403,7 @@ var require_verify = __commonJS({
       if (!request.source) {
         throw new Error("sender_auth: request has no source");
       }
-      const requestSource = parseSourceAsset(request.source.asset_identifier);
+      const requestSource = (0, utils_js_1.parseSourceAsset)(request.source.asset_identifier);
       const { sourceAsset, network: networkOverride, maxSourceAmount: amountOverride, ...scheme } = expected;
       const network = networkOverride ?? requestSource.network;
       const asset = sourceAsset ?? requestSource.asset;
@@ -2440,7 +3458,7 @@ var require_dist4 = __commonJS({
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.localKeySigner = exports.SignerMismatchError = exports.RecoveryFailedError = exports.MalformedPrehashError = exports.verifyPaymentRequest = exports.getChainAdapter = void 0;
+    exports.localKeySigner = exports.SignerMismatchError = exports.RecoveryFailedError = exports.MalformedPrehashError = exports.verifyPaymentRequest = exports.DESTINATION_COMMITMENT_WITNESS_VERSION = exports.usesDestinationCommitment = exports.MAX_DESTINATION_BYTES = exports.deriveDepositRequestHash = exports.buildEscrowDestination = exports.getChainAdapter = void 0;
     __exportStar(require_types(), exports);
     __exportStar(require_utils(), exports);
     __exportStar(require_chain_id(), exports);
@@ -2448,6 +3466,22 @@ var require_dist4 = __commonJS({
     Object.defineProperty(exports, "getChainAdapter", { enumerable: true, get: function() {
       return index_js_1.getChainAdapter;
     } });
+    var destination_js_1 = require_destination();
+    Object.defineProperty(exports, "buildEscrowDestination", { enumerable: true, get: function() {
+      return destination_js_1.buildEscrowDestination;
+    } });
+    Object.defineProperty(exports, "deriveDepositRequestHash", { enumerable: true, get: function() {
+      return destination_js_1.deriveDepositRequestHash;
+    } });
+    Object.defineProperty(exports, "MAX_DESTINATION_BYTES", { enumerable: true, get: function() {
+      return destination_js_1.MAX_DESTINATION_BYTES;
+    } });
+    Object.defineProperty(exports, "usesDestinationCommitment", { enumerable: true, get: function() {
+      return destination_js_1.usesDestinationCommitment;
+    } });
+    Object.defineProperty(exports, "DESTINATION_COMMITMENT_WITNESS_VERSION", { enumerable: true, get: function() {
+      return destination_js_1.DESTINATION_COMMITMENT_WITNESS_VERSION;
+    } });
     var verify_js_1 = require_verify();
     Object.defineProperty(exports, "verifyPaymentRequest", { enumerable: true, get: function() {
       return verify_js_1.verifyPaymentRequest;
@@ -2581,11 +3615,38 @@ function assetIdentifier(network, asset) {
   return `${network}/${assetTypeFor(network)}:${asset}`;
 }
 function sameAddress(a, b) {
+  if (typeof a !== "string" || typeof b !== "string") return false;
   if (a.startsWith("0x") && b.startsWith("0x")) {
     return a.toLowerCase() === b.toLowerCase();
   }
   return a === b;
 }
+function sameAssetIdentifier(a, b) {
+  if (a === b) return true;
+  const pa = splitAssetIdentifier(a);
+  const pb = splitAssetIdentifier(b);
+  if (!pa || !pb || pa.namespace !== pb.namespace || pa.assetNamespace !== pb.assetNamespace) {
+    return false;
+  }
+  const referenceMatches = pa.namespace === "solana" ? pa.reference === pb.reference : pa.reference.toLowerCase() === pb.reference.toLowerCase();
+  return referenceMatches && sameAddress(pa.token, pb.token);
+}
+function splitAssetIdentifier(identifier) {
+  if (typeof identifier !== "string") return void 0;
+  const slash = identifier.indexOf("/");
+  if (slash < 0) return void 0;
+  const chain = identifier.slice(0, slash);
+  const asset = identifier.slice(slash + 1);
+  const chainColon = chain.indexOf(":");
+  const assetColon = asset.indexOf(":");
+  if (chainColon < 0 || assetColon < 0) return void 0;
+  return {
+    namespace: chain.slice(0, chainColon).toLowerCase(),
+    reference: chain.slice(chainColon + 1),
+    assetNamespace: asset.slice(0, assetColon).toLowerCase(),
+    token: asset.slice(assetColon + 1)
+  };
+}
 function chainDefaultsFromExtra(extra, network) {
   return {
     escrowContract: extra.escrow,
@@ -2635,6 +3696,7 @@ export {
   namespaceOf,
   assetIdentifier,
   sameAddress,
+  sameAssetIdentifier,
   chainDefaultsFromExtra,
   contractOverridesFromExtra
 };