@catena/sdk 0.1.0 → 0.4.0

package/dist/movements.mjs

@@ -0,0 +1,334 @@
+import * as v from "valibot";
+import { getAddress, hashAuthorization, hashTypedData, keccak256, serializeTransaction } from "viem/utils";
+//#region src/movements.ts
+const addressSchema = v.pipe(v.string(), v.transform(getAddress));
+const digitsSchema = v.pipe(v.string(), v.regex(/^\d+$/));
+const hexBytesSchema = v.custom((value) => typeof value === "string" && /^0x([0-9a-fA-F]{2})*$/.test(value), "expected hex bytes");
+const bytes32Schema = v.custom((value) => typeof value === "string" && /^0x[0-9a-fA-F]{64}$/.test(value), "expected a 32-byte value");
+const USDC_EIP3009_NETWORKS = ["base", "base-sepolia"];
+const USDC_EIP3009_DOMAINS = {
+	base: {
+		name: "USD Coin",
+		version: "2",
+		chainId: 8453,
+		verifyingContract: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
+	},
+	"base-sepolia": {
+		name: "USDC",
+		version: "2",
+		chainId: 84532,
+		verifyingContract: "0x036CbD53842c5426634e7929541eC2318f3dCF7e"
+	}
+};
+const GAS_DELEGATE_DOMAIN = {
+	name: "TKGasDelegate",
+	version: "1.1"
+};
+const GAS_DELEGATE_ADDRESS = "0x955d84139e7621bc571b117d8eb5d28a4a222c6f";
+const NETWORK_CHAIN_IDS = {
+	...Object.fromEntries(Object.entries(USDC_EIP3009_DOMAINS).map(([network, domain]) => [network, domain.chainId])),
+	arc: 5042
+};
+const rawTransactionSchema = v.looseObject({ transaction: v.object({
+	chainId: v.pipe(v.number(), v.integer(), v.minValue(1)),
+	nonce: v.pipe(v.number(), v.integer(), v.minValue(0)),
+	to: addressSchema,
+	value: digitsSchema,
+	data: hexBytesSchema,
+	gas: digitsSchema,
+	maxFeePerGasWei: digitsSchema,
+	maxPriorityFeePerGasWei: digitsSchema
+}) });
+const transferAuthorizationSchema = v.looseObject({
+	network: v.picklist(USDC_EIP3009_NETWORKS),
+	authorization: v.object({
+		from: addressSchema,
+		to: addressSchema,
+		value: digitsSchema,
+		validAfter: v.union([v.number(), digitsSchema]),
+		validBefore: v.union([v.number(), digitsSchema]),
+		nonce: bytes32Schema
+	})
+});
+const delegationSchema = v.looseObject({ authorization: v.object({
+	address: addressSchema,
+	chainId: v.pipe(v.number(), v.integer(), v.minValue(1)),
+	nonce: v.pipe(v.number(), v.integer(), v.minValue(0))
+}) });
+const batchExecutionSchema = v.looseObject({ batch: v.object({
+	from: addressSchema,
+	chainId: v.pipe(v.number(), v.integer(), v.minValue(1)),
+	nonce: digitsSchema,
+	deadline: v.pipe(v.number(), v.integer(), v.minValue(1)),
+	calls: v.pipe(v.array(v.object({
+		to: addressSchema,
+		value: digitsSchema,
+		data: hexBytesSchema
+	})), v.minLength(1))
+}) });
+const preparedBodySchema = v.looseObject({
+	type: v.literal("ACTIVITY_TYPE_SIGN_RAW_PAYLOADS"),
+	parameters: v.looseObject({
+		signWith: addressSchema,
+		payloads: v.pipe(v.array(bytes32Schema), v.minLength(1)),
+		encoding: v.literal("PAYLOAD_ENCODING_HEXADECIMAL"),
+		hashFunction: v.literal("HASH_FUNCTION_NO_OP")
+	})
+});
+function usdcBaseUnits(amount) {
+	const match = /^(\d+)(?:\.(\d{1,6}))?$/.exec(amount.trim());
+	if (match === null) return null;
+	const [, whole = "0", fraction = ""] = match;
+	return BigInt(whole) * 1000000n + BigInt(fraction.padEnd(6, "0"));
+}
+function instructionFacts(instruction) {
+	try {
+		switch (instruction.kind) {
+			case "evm_raw_transaction": {
+				const { transaction } = v.parse(rawTransactionSchema, instruction.payload);
+				return {
+					digest: keccak256(serializeTransaction({
+						type: "eip1559",
+						chainId: transaction.chainId,
+						nonce: transaction.nonce,
+						to: transaction.to,
+						value: BigInt(transaction.value),
+						data: transaction.data,
+						gas: BigInt(transaction.gas),
+						maxFeePerGas: BigInt(transaction.maxFeePerGasWei),
+						maxPriorityFeePerGas: BigInt(transaction.maxPriorityFeePerGasWei),
+						accessList: []
+					})),
+					chainId: transaction.chainId,
+					movesNative: BigInt(transaction.value) !== 0n
+				};
+			}
+			case "eip3009_transfer_authorization": {
+				const { network, authorization } = v.parse(transferAuthorizationSchema, instruction.payload);
+				return {
+					digest: hashTypedData({
+						domain: USDC_EIP3009_DOMAINS[network],
+						types: { TransferWithAuthorization: [
+							{
+								name: "from",
+								type: "address"
+							},
+							{
+								name: "to",
+								type: "address"
+							},
+							{
+								name: "value",
+								type: "uint256"
+							},
+							{
+								name: "validAfter",
+								type: "uint256"
+							},
+							{
+								name: "validBefore",
+								type: "uint256"
+							},
+							{
+								name: "nonce",
+								type: "bytes32"
+							}
+						] },
+						primaryType: "TransferWithAuthorization",
+						message: {
+							from: authorization.from,
+							to: authorization.to,
+							value: BigInt(authorization.value),
+							validAfter: BigInt(authorization.validAfter),
+							validBefore: BigInt(authorization.validBefore),
+							nonce: authorization.nonce
+						}
+					}),
+					chainId: USDC_EIP3009_DOMAINS[network].chainId,
+					from: authorization.from
+				};
+			}
+			case "eip7702_delegation": {
+				const { authorization } = v.parse(delegationSchema, instruction.payload);
+				return {
+					digest: hashAuthorization({
+						address: authorization.address,
+						chainId: authorization.chainId,
+						nonce: authorization.nonce
+					}),
+					chainId: authorization.chainId,
+					delegate: authorization.address
+				};
+			}
+			case "eip712_execution": {
+				const { batch } = v.parse(batchExecutionSchema, instruction.payload);
+				return {
+					digest: hashTypedData({
+						domain: {
+							...GAS_DELEGATE_DOMAIN,
+							chainId: batch.chainId,
+							verifyingContract: batch.from
+						},
+						types: {
+							BatchExecution: [
+								{
+									name: "nonce",
+									type: "uint128"
+								},
+								{
+									name: "deadline",
+									type: "uint32"
+								},
+								{
+									name: "calls",
+									type: "Call[]"
+								}
+							],
+							Call: [
+								{
+									name: "to",
+									type: "address"
+								},
+								{
+									name: "value",
+									type: "uint256"
+								},
+								{
+									name: "data",
+									type: "bytes"
+								}
+							]
+						},
+						primaryType: "BatchExecution",
+						message: {
+							nonce: BigInt(batch.nonce),
+							deadline: batch.deadline,
+							calls: batch.calls.map((call) => ({
+								to: call.to,
+								value: BigInt(call.value),
+								data: call.data
+							}))
+						}
+					}),
+					from: batch.from,
+					chainId: batch.chainId,
+					movesNative: batch.calls.some((call) => BigInt(call.value) !== 0n)
+				};
+			}
+		}
+	} catch {
+		return null;
+	}
+	return null;
+}
+function rebuildInstructionDigest(instruction) {
+	return instructionFacts(instruction)?.digest ?? null;
+}
+function sameList(left, right) {
+	return left.length === right.length && left.every((value, index) => value === right[index]);
+}
+function verifyPreparedMovement(prepared, requested) {
+	if (prepared.instructions.length === 0) return {
+		ok: false,
+		reason: "The approval carries nothing to sign."
+	};
+	const signer = prepared.signerAddress.toLowerCase();
+	for (const instruction of prepared.instructions) {
+		const facts = instructionFacts(instruction);
+		if (facts === null || facts.digest.toLowerCase() !== instruction.digest.toLowerCase()) return {
+			ok: false,
+			reason: "An instruction does not match what it says it signs."
+		};
+		if (instruction.signerAddress.toLowerCase() !== signer) return {
+			ok: false,
+			reason: "An instruction names a different wallet than the approval."
+		};
+		const named = NETWORK_CHAIN_IDS[instruction.network];
+		if (named === void 0) return {
+			ok: false,
+			reason: `An instruction names a network this client cannot place: ${instruction.network}. If the payment looks right, this client may be out of date.`
+		};
+		if (facts.chainId !== named) return {
+			ok: false,
+			reason: "An instruction names a different network than it signs on."
+		};
+		if (facts.delegate !== void 0 && facts.delegate.toLowerCase() !== GAS_DELEGATE_ADDRESS) return {
+			ok: false,
+			reason: "An instruction would hand the wallet over to an unrecognised contract."
+		};
+		if (facts.from !== void 0 && facts.from.toLowerCase() !== signer) return {
+			ok: false,
+			reason: "An instruction would spend from a different wallet."
+		};
+		if (facts.movesNative === true) return {
+			ok: false,
+			reason: "An instruction would move the network's own token."
+		};
+	}
+	const rebuiltDigests = prepared.instructions.map((instruction) => instruction.digest.toLowerCase());
+	if (new Set(rebuiltDigests).size !== rebuiltDigests.length) return {
+		ok: false,
+		reason: "The approval lists the same digest more than once."
+	};
+	const spentNonces = new Set();
+	for (const instruction of prepared.instructions) {
+		if (instruction.kind !== "eip3009_transfer_authorization") continue;
+		const parsed = v.safeParse(transferAuthorizationSchema, instruction.payload);
+		if (!parsed.success) continue;
+		const { network, authorization } = parsed.output;
+		const spent = `${network}:${authorization.from.toLowerCase()}:${authorization.nonce.toLowerCase()}`;
+		if (spentNonces.has(spent)) return {
+			ok: false,
+			reason: "The approval spends one authorization nonce twice."
+		};
+		spentNonces.add(spent);
+	}
+	if (!sameList(prepared.digests.map((digest) => digest.toLowerCase()), rebuiltDigests)) return {
+		ok: false,
+		reason: "The approval lists different digests than its instructions."
+	};
+	let body;
+	try {
+		body = v.parse(preparedBodySchema, JSON.parse(prepared.body));
+	} catch {
+		return {
+			ok: false,
+			reason: "The prepared request is not in the shape expected."
+		};
+	}
+	if (!sameList(body.parameters.payloads.map((payload) => payload.toLowerCase()), rebuiltDigests)) return {
+		ok: false,
+		reason: "The prepared request would sign different digests."
+	};
+	if (body.parameters.signWith.toLowerCase() !== signer) return {
+		ok: false,
+		reason: "The prepared request names a different wallet than the approval."
+	};
+	return bindsRequestedAmount(prepared, signer, requested);
+}
+function bindsRequestedAmount(prepared, signer, requested) {
+	if (requested === void 0) return { ok: true };
+	const wanted = usdcBaseUnits(requested.amount);
+	if (wanted === null) return {
+		ok: false,
+		reason: "The requested amount is not an amount this client can check."
+	};
+	let delivered = 0n;
+	for (const instruction of prepared.instructions) {
+		if (instruction.kind === "evm_raw_transaction" || instruction.kind === "eip712_execution") return { ok: true };
+		if (instruction.kind !== "eip3009_transfer_authorization") continue;
+		const parsed = v.safeParse(transferAuthorizationSchema, instruction.payload);
+		if (!parsed.success) return {
+			ok: false,
+			reason: "An instruction does not match what it says it signs."
+		};
+		if (parsed.output.authorization.to.toLowerCase() !== signer) delivered += BigInt(parsed.output.authorization.value);
+	}
+	if (delivered === wanted) return { ok: true };
+	return {
+		ok: false,
+		reason: "This approval does not pay the amount that was requested."
+	};
+}
+//#endregion
+export { rebuildInstructionDigest, verifyPreparedMovement };

package/dist/mpp.d.mts

@@ -1,6 +1,12 @@
-import { A as IntentResult, i as FetchLike, n as CatenaClient } from "./client-Cm2wNUuB.mjs";
+import { J as WalletCounterpartyRail, N as IntentResult, i as FetchLike, n as CatenaClient } from "./client-B_Gi0aqH.mjs";
 import { Method, z } from "mppx";
 //#region src/mpp.d.ts
+/**
+ * CAIP-2 network carried by an EVM MPP charge. Known values provide editor
+ * hints, while other strings remain representable because the server decides
+ * which networks are payable.
+ */
+export type MppNetwork = "eip155:8453" | "eip155:84532" | "eip155:5042" | (string & {});
 declare const evmCharge: {
   readonly name: "evm";
   readonly intent: "charge";
@@ -71,7 +77,7 @@ declare const usdcCharge: {
 /**
  * Parameters shared by both Catena MPP charge methods.
  */
-interface CatenaMppParameters {
+export interface CatenaMppParameters {
   /**
    * A linked Catena SDK client used to submit the payment intent.
    */
@@ -89,32 +95,32 @@ interface CatenaMppParameters {
 /**
  * Catena-backed `evm/charge` mppx client method.
  */
-type CatenaEvmChargeMethod = Method.Client<typeof evmCharge>;
+export type CatenaEvmChargeMethod = Method.Client<typeof evmCharge>;
 /**
  * Catena-backed `usdc/charge` mppx client method.
  */
-type CatenaUsdcChargeMethod = Method.Client<typeof usdcCharge>;
+export type CatenaUsdcChargeMethod = Method.Client<typeof usdcCharge>;
 /**
  * Both Catena methods registered by the factory.
  */
-type CatenaMppMethods = readonly [CatenaEvmChargeMethod, CatenaUsdcChargeMethod];
+export type CatenaMppMethods = readonly [CatenaEvmChargeMethod, CatenaUsdcChargeMethod];
 /**
  * Callable Catena MPP factory, with the conventional charge alias.
  */
-interface CatenaMppFactory {
+export interface CatenaMppFactory {
   (parameters: CatenaMppParameters): CatenaMppMethods;
   charge(parameters: CatenaMppParameters): CatenaMppMethods;
 }
 /**
  * Status of a Catena MPP intent that did not yield a usable credential.
  */
-type MppPaymentStatus = IntentResult["status"];
+export type MppPaymentStatus = IntentResult["status"];
 /**
  * A Catena MPP intent completed without a usable credential or stopped in a
  * non-completed state. Inspect `status` to choose a recovery path and
  * `intentId` to reconcile the payment with `client.getIntent(intentId)`.
  */
-declare class MppPaymentError extends Error {
+export declare class MppPaymentError extends Error {
   readonly intentId: string;
   readonly status: MppPaymentStatus;
   readonly reasons: readonly string[];
@@ -130,7 +136,7 @@ declare class MppPaymentError extends Error {
  * Credential-free record of an MPP payment completed by the managed fetch
  * wrapper.
  */
-interface MppPaymentReceipt {
+export interface MppPaymentReceipt {
   /**
    * Catena intent that completed the payment.
    */
@@ -146,7 +152,7 @@ interface MppPaymentReceipt {
   /**
    * CAIP-2 network on which the payment was authorized.
    */
-  readonly network: "eip155:8453" | "eip155:84532";
+  readonly network: MppNetwork;
   /**
    * EVM address that received the payment authorization.
    */
@@ -161,7 +167,7 @@ interface MppPaymentReceipt {
  * after Catena created an intent; `reasons` carries server recovery detail
  * without exposing the payment credential.
  */
-declare class MppFetchPaymentError extends Error {
+export declare class MppFetchPaymentError extends Error {
   /**
    * Catena intent to reconcile, when one was created.
    */
@@ -179,7 +185,7 @@ declare class MppFetchPaymentError extends Error {
 /**
  * None of the offered MPP networks can be funded by the selected account.
  */
-declare class MppNetworkMismatchError extends MppFetchPaymentError {
+export declare class MppNetworkMismatchError extends MppFetchPaymentError {
   /**
    * Account that needs a wallet on one of the required networks.
    */
@@ -187,14 +193,14 @@ declare class MppNetworkMismatchError extends MppFetchPaymentError {
   /**
    * Offered networks that Catena reported as mismatches.
    */
-  readonly requiredNetworks: readonly ("eip155:8453" | "eip155:84532")[];
-  constructor(accountId: string, requiredNetworks: readonly ("eip155:8453" | "eip155:84532")[], reasons: readonly string[]);
+  readonly requiredNetworks: readonly MppNetwork[];
+  constructor(accountId: string, requiredNetworks: readonly MppNetwork[], reasons: readonly string[]);
 }
 /**
  * The selected MPP recipient is not saved as a usable Catena counterparty
  * rail.
  */
-declare class MppCounterpartyNotFoundError extends MppFetchPaymentError {
+export declare class MppCounterpartyNotFoundError extends MppFetchPaymentError {
   /**
    * Recipient address that must be added.
    */
@@ -202,14 +208,20 @@ declare class MppCounterpartyNotFoundError extends MppFetchPaymentError {
   /**
    * Network on which the recipient was offered.
    */
-  readonly network: "eip155:8453" | "eip155:84532";
-  constructor(recipient: string, network: "eip155:8453" | "eip155:84532", reasons: readonly string[]);
+  readonly network: MppNetwork;
+  /**
+   * Server-resolved Catena rail that can be passed to a
+   * `create_counterparty` intent. Absent when the server sends no valid rail,
+   * or when the rail names a different recipient than the challenge.
+   */
+  readonly requiredRail: WalletCounterpartyRail | undefined;
+  constructor(recipient: string, network: MppNetwork, reasons: readonly string[], requiredRail?: WalletCounterpartyRail);
 }
 /**
  * The MPP payment is parked for human approval. Retry the original request
  * after approval so a fresh challenge can consume the grant.
  */
-declare class MppApprovalPendingError extends MppFetchPaymentError {
+export declare class MppApprovalPendingError extends MppFetchPaymentError {
   /**
    * Time at which the pending approval expires, when supplied by Catena.
    */
@@ -219,7 +231,7 @@ declare class MppApprovalPendingError extends MppFetchPaymentError {
 /**
  * Catena terminally blocked or failed the selected MPP payment.
  */
-declare class MppPaymentDeclinedError extends MppFetchPaymentError {
+export declare class MppPaymentDeclinedError extends MppFetchPaymentError {
   /**
    * Terminal intent disposition.
    */
@@ -230,7 +242,7 @@ declare class MppPaymentDeclinedError extends MppFetchPaymentError {
  * Submission failed where Catena may already have acted. Reconcile the intent
  * before authorizing another payment.
  */
-declare class MppSubmitInterruptedError extends MppFetchPaymentError {
+export declare class MppSubmitInterruptedError extends MppFetchPaymentError {
   /**
    * Validated MPP method whose submission became ambiguous.
    */
@@ -242,7 +254,7 @@ declare class MppSubmitInterruptedError extends MppFetchPaymentError {
   /**
    * Network on which submission may have occurred.
    */
-  readonly network: "eip155:8453" | "eip155:84532";
+  readonly network: MppNetwork;
   /**
    * Recipient whose payment may have been submitted.
    */
@@ -254,7 +266,7 @@ declare class MppSubmitInterruptedError extends MppFetchPaymentError {
   constructor(intentId: string, terms: {
     readonly method: "evm" | "usdc";
     readonly atomicAmount: string;
-    readonly network: "eip155:8453" | "eip155:84532";
+    readonly network: MppNetwork;
     readonly recipient: string;
   }, resourceUrl: string, cause: unknown);
 }
@@ -262,7 +274,7 @@ declare class MppSubmitInterruptedError extends MppFetchPaymentError {
  * Payment completed but `onPayment` or the single paid retry failed. The
  * credential-free receipt identifies the settled intent for reconciliation.
  */
-declare class MppRetryFailedError extends MppFetchPaymentError {
+export declare class MppRetryFailedError extends MppFetchPaymentError {
   /**
    * Completed payment that must not be paid a second time.
    */
@@ -272,7 +284,7 @@ declare class MppRetryFailedError extends MppFetchPaymentError {
 /**
  * Options for the managed MPP fetch wrapper.
  */
-interface MppFetchOptions {
+export interface MppFetchOptions {
   /**
    * Catena account whose wallet authorizes payments.
    */
@@ -292,11 +304,11 @@ interface MppFetchOptions {
   readonly onPayment?: (receipt: MppPaymentReceipt) => void | Promise<void>;
 }
 /**
- * Create Catena-backed mppx charge methods for native USDC on Base and Base
- * Sepolia. Pass the returned tuple directly in `Mppx.create({ methods: [...]
- * })`.
+ * Create Catena-backed mppx EVM charge methods. The Catena server decides
+ * which networks and token contracts are payable. Pass the returned tuple
+ * directly in `Mppx.create({ methods: [...] })`.
  */
-declare const catena: CatenaMppFactory;
+export declare const catena: CatenaMppFactory;
 /**
  * Wrap `fetch` with one managed MPP payment attempt. Ordinary responses and
  * 402s without a decodable MPP challenge pass through unchanged. For a
@@ -310,6 +322,6 @@ declare const catena: CatenaMppFactory;
  * failures throw `MppRetryFailedError`; do not run the payment loop again
  * without first reconciling that receipt's intent.
  */
-declare function wrapFetchWithMppPayment(client: CatenaClient, options: MppFetchOptions): FetchLike;
+export declare function wrapFetchWithMppPayment(client: CatenaClient, options: MppFetchOptions): FetchLike;
 //#endregion
-export { CatenaEvmChargeMethod, CatenaMppFactory, CatenaMppMethods, CatenaMppParameters, CatenaUsdcChargeMethod, MppApprovalPendingError, MppCounterpartyNotFoundError, MppFetchOptions, MppFetchPaymentError, MppNetworkMismatchError, MppPaymentDeclinedError, MppPaymentError, MppPaymentReceipt, MppPaymentStatus, MppRetryFailedError, MppSubmitInterruptedError, catena, wrapFetchWithMppPayment };
+export type { WalletCounterpartyRail };

package/dist/mpp.mjs

@@ -1,5 +1,5 @@
-import { T as paymentCredentialFromIntentData, n as IntentSubmitError, t as ApiError } from "./client-CHZMO00P.mjs";
-import { a as assertNever, i as isReplayableFetchRequest, n as reportSettlementHint, r as fetchRetryHeaders, t as EVM_TRANSACTION_HASH_PATTERN } from "./settlement-report-CT3EbtLL.mjs";
+import { k as paymentCredentialFromIntentData, n as IntentSubmitError, t as ApiError } from "./client-BSYVYJGm.mjs";
+import { a as isReplayableFetchRequest, i as fetchRetryHeaders, n as reportSettlementHint, o as requiredWalletRailFromDetails, r as paymentNetworkLabel, s as assertNever, t as EVM_TRANSACTION_HASH_PATTERN } from "./settlement-report-DTxaAxE3.mjs";
 import { Credential, Method, PaymentRequest, Receipt, z } from "mppx";
 import { Mppx } from "mppx/client";
 import { isAddress } from "viem";
@@ -39,8 +39,6 @@ function isLoopbackHostname(hostname) {
 }
 //#endregion
 //#region src/mpp.ts
-const BASE_USDC = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
-const BASE_SEPOLIA_USDC = "0x036CbD53842c5426634e7929541eC2318f3dCF7e";
 const MAX_REQUEST_LENGTH = 16384;
 const MAX_CHALLENGE_BYTES = 32768;
 const MIN_REMAINING_MS = 5e3;
@@ -143,7 +141,7 @@ var MppNetworkMismatchError = class extends MppFetchPaymentError {
 	accountId;
 	requiredNetworks;
 	constructor(accountId, requiredNetworks, reasons) {
-		super(`Account ${accountId} cannot pay on the MPP challenge's required network${requiredNetworks.length === 1 ? "" : "s"}: ${requiredNetworks.join(", ")}`, { reasons });
+		super(`Account ${accountId} cannot pay on the MPP challenge's required network${requiredNetworks.length === 1 ? "" : "s"}: ${requiredNetworks.map(paymentNetworkLabel).join(", ")}`, { reasons });
 		this.name = "MppNetworkMismatchError";
 		this.accountId = accountId;
 		this.requiredNetworks = requiredNetworks;
@@ -152,11 +150,13 @@ var MppNetworkMismatchError = class extends MppFetchPaymentError {
 var MppCounterpartyNotFoundError = class extends MppFetchPaymentError {
 	recipient;
 	network;
-	constructor(recipient, network, reasons) {
+	requiredRail;
+	constructor(recipient, network, reasons, requiredRail) {
 		super(`No saved Catena counterparty rail can pay ${recipient} on ${network}`, { reasons });
 		this.name = "MppCounterpartyNotFoundError";
 		this.recipient = recipient;
 		this.network = network;
+		this.requiredRail = requiredRail;
 	}
 };
 var MppApprovalPendingError = class extends MppFetchPaymentError {
@@ -340,7 +340,7 @@ function terminalMppCandidateError(accountId, skips) {
 		...otherSkips
 	].map((skip) => skip.error.message))];
 	const unsaved = counterpartySkips.find((skip) => skip.error.status === 404);
-	if (unsaved) return new MppCounterpartyNotFoundError(unsaved.terms.recipient, unsaved.terms.network, reasons);
+	if (unsaved) return new MppCounterpartyNotFoundError(unsaved.terms.recipient, unsaved.terms.network, reasons, requiredWalletRailFromDetails(unsaved.error.details, unsaved.terms.recipient));
 	if (mismatchSkips.length > 0 && counterpartySkips.length === 0) return new MppNetworkMismatchError(accountId, [...new Set(mismatchSkips.map((skip) => skip.terms.network))], reasons);
 	return new MppFetchPaymentError("No supported candidate in the MPP challenge is payable from this account", { reasons });
 }
@@ -450,8 +450,8 @@ function isCanonicalizableText(value, maximumLength) {
 function supportedEvmRequest(request, maxAtomicAmount) {
 	const result = evmRequestSchema.safeParse(request);
 	if (!result.success || !hasSupportedCommonRequest(result.data, maxAtomicAmount)) return;
-	const { amount, currency, methodDetails, recipient } = result.data;
-	const network = nativeUsdcNetwork(methodDetails.chainId, currency);
+	const { amount, methodDetails, recipient } = result.data;
+	const network = evmNetwork(methodDetails.chainId);
 	return isSupportedMethodDetails(methodDetails) && methodDetails.credentialTypes.length === 1 && network !== void 0 ? {
 		method: "evm",
 		atomicAmount: amount,
@@ -462,9 +462,9 @@ function supportedEvmRequest(request, maxAtomicAmount) {
 function supportedUsdcRequest(request, maxAtomicAmount) {
 	const result = usdcRequestSchema.safeParse(request);
 	if (!result.success || !hasSupportedCommonRequest(result.data, maxAtomicAmount)) return;
-	const { amount, currency, methodDetails, recipient } = result.data;
+	const { amount, methodDetails, recipient } = result.data;
 	const details = methodDetails.evm;
-	const network = nativeUsdcNetwork(details.chainId, currency);
+	const network = evmNetwork(details.chainId);
 	return isSupportedMethodDetails(details) && (details.credentialTypes === void 0 || details.credentialTypes.length === 1) && network !== void 0 ? {
 		method: "usdc",
 		atomicAmount: amount,
@@ -475,9 +475,8 @@ function supportedUsdcRequest(request, maxAtomicAmount) {
 function isSupportedMethodDetails(details) {
 	return Number.isSafeInteger(details.chainId) && details.chainId >= 1 && (details.permit2Address === void 0 || isAddress$1(details.permit2Address));
 }
-function nativeUsdcNetwork(chainId, currency) {
-	if (chainId === 8453) return currency.toLowerCase() === BASE_USDC.toLowerCase() ? "eip155:8453" : void 0;
-	if (chainId === 84532) return currency.toLowerCase() === BASE_SEPOLIA_USDC.toLowerCase() ? "eip155:84532" : void 0;
+function evmNetwork(chainId) {
+	return Number.isSafeInteger(chainId) && chainId >= 1 ? `eip155:${chainId}` : void 0;
 }
 function supportedEnvelope(challenge) {
 	if (!hasSupportedChallengeStrings(challenge)) return;

package/dist/{settlement-report-CT3EbtLL.mjs → settlement-report-DTxaAxE3.mjs}

@@ -1,8 +1,18 @@
+import { C as walletCounterpartyRailSchema } from "./client-BSYVYJGm.mjs";
+import * as v from "valibot";
 //#region src/lib/assert-never.ts
 function assertNever(value) {
 	throw new Error(`Unhandled case: ${String(value)}`);
 }
 //#endregion
+//#region src/lib/counterparty-recovery.ts
+const requiredRailDetailsSchema = v.object({ requiredRail: walletCounterpartyRailSchema });
+function requiredWalletRailFromDetails(details, expectedAddress) {
+	const parsed = v.safeParse(requiredRailDetailsSchema, details);
+	if (!parsed.success || parsed.output.requiredRail.walletAddress.toLowerCase() !== expectedAddress.toLowerCase()) return;
+	return parsed.output.requiredRail;
+}
+//#endregion
 //#region src/lib/fetch-replay.ts
 function isReplayableFetchRequest(input, init) {
 	if (init?.body !== void 0 && init.body !== null) {
@@ -19,6 +29,17 @@ function fetchRetryHeaders(input, init) {
 	return headers;
 }
 //#endregion
+//#region src/lib/payment-network.ts
+const PAYMENT_NETWORK_LABELS = {
+	"eip155:8453": "Base",
+	"eip155:84532": "Base Sepolia",
+	"eip155:5042": "Arc"
+};
+function paymentNetworkLabel(network) {
+	const label = Object.hasOwn(PAYMENT_NETWORK_LABELS, network) ? PAYMENT_NETWORK_LABELS[network] : void 0;
+	return label ? `${label} (${network})` : network;
+}
+//#endregion
 //#region src/lib/settlement-report.ts
 const EVM_TRANSACTION_HASH_PATTERN = /^0x[0-9a-fA-F]{64}$/;
 async function reportSettlementHint(client, intentId, txHash, receipt) {
@@ -33,4 +54,4 @@ async function reportSettlementHint(client, intentId, txHash, receipt) {
 	}
 }
 //#endregion
-export { assertNever as a, isReplayableFetchRequest as i, reportSettlementHint as n, fetchRetryHeaders as r, EVM_TRANSACTION_HASH_PATTERN as t };
+export { isReplayableFetchRequest as a, fetchRetryHeaders as i, reportSettlementHint as n, requiredWalletRailFromDetails as o, paymentNetworkLabel as r, assertNever as s, EVM_TRANSACTION_HASH_PATTERN as t };