mppx 0.11.0 → 0.12.0

package/dist/tempo/server/Charge.js

@@ -33,7 +33,9 @@ import * as SponsorBudget from './SponsorBudget.js';
  * ```
  */
 export function charge(parameters = {}) {
-    const { machineTokenEnabled, amount, currency = defaults.resolveCurrency(parameters), decimals = defaults.decimals, description, externalId, feeToken: configuredFeeToken, feePayerPolicy, html, relay, sponsorBudget, splits, supportedModes, validateSender, waitForConfirmation = true, } = parameters;
+    const { machineTokenEnabled, allowedFeeTokens: configuredAllowedFeeTokens, amount, currency = defaults.resolveCurrency(parameters), decimals = defaults.decimals, description, externalId, feeToken: configuredFeeToken, feePayerPolicy, html, relay, sponsorBudget, splits, supportedModes, validateSender, waitForConfirmation = true, } = parameters;
+    if (configuredAllowedFeeTokens?.length === 0)
+        throw new Error('`allowedFeeTokens` must contain at least one token.');
     const storeKeyPrefix = parameters.storeKeyPrefix ?? '';
     const rawStore = (parameters.store ?? Store.memory());
     const store = Store.from(rawStore, { keyPrefix: storeKeyPrefix });
@@ -92,7 +94,12 @@ export function charge(parameters = {}) {
         Expires.assert(challenge.expires, challenge.id);
         if (isZeroAmount && payload.type !== 'proof')
             throw new MismatchError('Zero-amount challenges require a proof credential.', {});
+        // Request-level local sponsorship takes precedence over the hosted provider.
+        const localFeePayer = Account.is(request.feePayer) ? request.feePayer : feePayer;
+        const allowedFeeTokens = configuredAllowedFeeTokens ??
+            (localFeePayer || !remoteFeePayer ? FeePayer.defaultAllowedFeeTokens(chainId) : undefined);
         return {
+            allowedFeeTokens,
             amount,
             machineTokenEnabled,
             chainId,
@@ -208,7 +215,7 @@ export function charge(parameters = {}) {
         if (isFeePayerTx) {
             if (!machineTokenRoute)
                 FeePayer.validateCalls(transaction.calls, { amount, currency, recipient }, { currency, expectedTransfers: transfers });
-            FeePayer.assertAllowedFeeToken(transaction, FeePayer.defaultAllowedFeeTokens(chainId));
+            FeePayer.assertAllowedFeeToken(transaction, context.allowedFeeTokens);
         }
         else {
             await viem_call(client, FeePayer.simulationTransaction(transaction, { feePayer: false }));
@@ -305,6 +312,8 @@ export function charge(parameters = {}) {
             const chainId = await (async () => {
                 if (request.chainId)
                     return request.chainId;
+                if (parameters.chainId !== undefined)
+                    return parameters.chainId;
                 if (parameters.testnet)
                     return defaults.chainId.testnet;
                 return (await getClient({})).chain?.id;
@@ -402,12 +411,10 @@ export function charge(parameters = {}) {
                     let finalHash;
                     let reservation;
                     try {
-                        const allowedFeeTokens = FeePayer.defaultAllowedFeeTokens(chainId);
-                        if (isFeePayerTx)
-                            FeePayer.assertAllowedFeeToken(transaction, allowedFeeTokens);
-                        const selectableFeeTokens = allowedFeeTokens;
+                        const { allowedFeeTokens } = context;
                         const completedTransaction = await (async () => {
                             if (feePayerAccount && methodDetails?.feePayer !== false) {
+                                const selectableFeeTokens = allowedFeeTokens ?? FeePayer.defaultAllowedFeeTokens(chainId);
                                 const completed = await FeePayer.preflightSponsorship({
                                     transaction,
                                     simulate: (request) => viem_call(client, request),
@@ -422,7 +429,7 @@ export function charge(parameters = {}) {
                                             }));
                                         const sponsored = FeePayer.prepareSponsoredTransaction({
                                             account: feePayerAccount,
-                                            allowedFeeTokens,
+                                            allowedFeeTokens: selectableFeeTokens,
                                             challengeExpires: expires,
                                             chainId: chainId ?? client.chain.id,
                                             details: { amount, currency, recipient },
@@ -901,34 +908,29 @@ function toReceipt(receipt) {
         reference: transactionHash,
     };
 }
-/**
- * Asserts that at least one of the matched payment logs carries a
- * challenge-bound memo nonce (keccak256(challengeId)[0..6] in bytes 25–31).
- * Only checks logs that were matched by `assertTransferLogs`, not the
- * entire receipt — preventing unrelated dust transfers from satisfying
- * the binding.
- * @internal
- */
 function assertChallengeBoundMemo(matchedLogs, parameters) {
-    const bound = matchedLogs.some((log) => {
-        if (log.kind !== 'memo')
-            return false;
-        if (!Attribution.verifyServer(log.args.memo, parameters.realm))
-            return false;
-        return Attribution.verifyChallengeBinding(log.args.memo, parameters.challengeId);
-    });
-    if (!bound)
-        throw new MismatchError('Payment verification failed: memo is not bound to this challenge.', {});
+    assertChallengeBoundMemos(matchedLogs.map((log) => (log.kind === 'memo' ? log.args.memo : undefined)), parameters);
 }
 function assertChallengeBoundCallMemo(matchedCalls, parameters) {
-    const bound = matchedCalls.some((call) => {
-        if (!call.memo)
-            return false;
-        const memo = call.memo;
-        if (!Attribution.verifyServer(memo, parameters.realm))
-            return false;
-        return Attribution.verifyChallengeBinding(memo, parameters.challengeId);
-    });
+    assertChallengeBoundMemos(matchedCalls.map((call) => call.memo), parameters);
+}
+/**
+ * Requires a challenge-bound attribution memo and rejects conflicting attribution
+ * on matched payment transfers. Otherwise, a split payment could authorize another
+ * challenge after the first challenge's replay marker expires. Unmatched transfers
+ * cannot establish the binding; plain transfers and non-MPP memos remain allowed.
+ * @internal
+ */
+function assertChallengeBoundMemos(memos, parameters) {
+    let bound = false;
+    for (const memo of memos) {
+        if (!memo || !Attribution.isMppMemo(memo))
+            continue;
+        if (!Attribution.verifyServer(memo, parameters.realm) ||
+            !Attribution.verifyChallengeBinding(memo, parameters.challengeId))
+            throw new MismatchError('Payment verification failed: memo is not bound to this challenge.', {});
+        bound = true;
+    }
     if (!bound)
         throw new MismatchError('Payment verification failed: memo is not bound to this challenge.', {});
 }