mppx 0.13.4 → 0.13.5

package/dist/tempo/session/precompile/Chain.d.ts

@@ -155,6 +155,8 @@ export type ReadbackRetryOptions = {
     retries?: number | undefined;
     /** Delay between attempts, in milliseconds. @default 250 */
     delayMs?: number | undefined;
+    /** Whether a failed attempt may be retried. @default every failure */
+    shouldRetry?: ((error: unknown) => boolean) | undefined;
 };
 /**
  * Retry an on-chain readback that is pinned to the block containing a just-sent

package/dist/tempo/session/precompile/Chain.js

@@ -169,7 +169,7 @@ export async function getChannelStatesBatch(client, channelIds, escrow = tip20Ch
  * verification even though the open transaction succeeded.
  */
 export async function readbackWithRetry(read, options = {}) {
-    const { retries = 5, delayMs = 250 } = options;
+    const { retries = 5, delayMs = 250, shouldRetry = () => true } = options;
     let lastError;
     for (let attempt = 0; attempt <= retries; attempt++) {
         try {
@@ -177,6 +177,8 @@ export async function readbackWithRetry(read, options = {}) {
         }
         catch (error) {
             lastError = error;
+            if (!shouldRetry(error))
+                break;
             if (attempt < retries)
                 await new Promise((resolve) => setTimeout(resolve, delayMs));
         }

package/dist/tempo/session/server/Session.js

@@ -13,12 +13,12 @@ import * as Errors from '../../../Errors.js';
 import * as Expires from '../../../Expires.js';
 import * as Method from '../../../Method.js';
 import * as ChallengeMeta from '../../../server/internal/challengeMeta.js';
-import * as Store from '../../../Store.js';
 import * as Client from '../../../viem/Client.js';
 import * as Account from '../../internal/account.js';
 import * as defaults from '../../internal/defaults.js';
 import * as Methods from '../../Methods.js';
 import * as ChargeServer from '../../server/Charge.js';
+import { fallbackStore } from '../../server/internal/fallback-store.js';
 import * as Transport from '../../server/internal/transport.js';
 import { tip20ChannelEscrow } from '../precompile/Protocol.js';
 import { deserializeSnapshot as deserializeSessionSnapshot, serializeSnapshot as serializeSessionSnapshot, } from '../Snapshot.js';
@@ -66,17 +66,14 @@ function createBootstrapChallenge(parameters) {
     });
 }
 function respondBootstrapChallenge(challenge, error) {
-    const headers = new Headers({
-        [Constants.Headers.wwwAuthenticate]: Challenge.serialize(challenge),
-        'Cache-Control': 'no-store',
-    });
+    const headers = new Headers({ 'Cache-Control': 'no-store' });
+    // A 403 is final: omit the challenge, as `Transport.http()` does.
+    if (error?.status !== 403)
+        headers.set(Constants.Headers.wwwAuthenticate, Challenge.serialize(challenge));
     if (!error)
         return new Response(null, { status: 402, headers });
     headers.set('Content-Type', 'application/problem+json');
-    return new Response(JSON.stringify(error.toProblemDetails(challenge.id)), {
-        status: error.status,
-        headers,
-    });
+    return new Response(JSON.stringify(error.toProblemDetails(error.status === 403 ? undefined : challenge.id)), { status: error.status, headers });
 }
 function assertBootstrapChallengeMatches(expected, actual) {
     if (actual.method !== Constants.Methods.tempo || actual.intent !== Constants.Intents.charge)
@@ -164,7 +161,9 @@ async function handleBootstrapPreflight(parameters) {
         });
     }
     catch (error) {
-        return respondBootstrapChallenge(challenge, error instanceof Errors.PaymentError ? error : new Errors.InternalPaymentError());
+        return respondBootstrapChallenge(challenge, error instanceof Errors.PaymentError
+            ? error
+            : new Errors.InternalPaymentError({ cause: error }));
     }
     const channelId = await resolveSessionChannelId({
         capturedRequest: parameters.capturedRequest,
@@ -195,7 +194,7 @@ async function handleBootstrapPreflight(parameters) {
 /** Creates a server-side TIP20EscrowChannel precompile session payment method. */
 export function session(p) {
     const parameters = p;
-    const { amount, channelStateTtl = 5_000, currency = defaults.resolveCurrency(parameters), decimals = defaults.decimals, operator, store: rawStore = Store.memory(), suggestedDeposit, unitType, } = parameters;
+    const { amount, channelStateTtl = 5_000, currency = defaults.resolveCurrency(parameters), decimals = defaults.decimals, operator, store: rawStore = fallbackStore('tempo.session'), suggestedDeposit, unitType, } = parameters;
     const settlementSchedule = resolveSettlementSchedule(parameters.settlementSchedule, decimals);
     const onSessionSettlement = parameters.onSessionSettlement;
     const onSessionSettlementFailure = parameters.onSessionSettlementFailure;

package/dist/tempo/session/server/Settlement.js

@@ -1,4 +1,4 @@
-import { BaseError as viem_BaseError, HttpRequestError, InternalRpcError, isAddress, isAddressEqual, LimitExceededRpcError, parseUnits, ResourceUnavailableRpcError, RpcRequestError, SocketClosedError, TimeoutError, WaitForTransactionReceiptTimeoutError, WebSocketRequestError, zeroAddress, } from 'viem';
+import { BaseError as viem_BaseError, ExecutionRevertedError, HttpRequestError, InternalRpcError, isAddress, isAddressEqual, LimitExceededRpcError, parseUnits, ResourceUnavailableRpcError, RpcRequestError, SocketClosedError, TimeoutError, WaitForTransactionReceiptTimeoutError, WebSocketRequestError, zeroAddress, } from 'viem';
 import { BadRequestError, ChannelClosedError, ChannelNotFoundError, InsufficientBalanceError, VerificationFailedError, } from '../../../Errors.js';
 import { isSessionContentRequest } from '../../server/internal/request-body.js';
 import * as Chain from '../precompile/Chain.js';
@@ -307,7 +307,10 @@ export async function settle(store_, client, channelId_, options) {
         sender: account?.address,
     });
     const amount = uint96(channel.highestVoucher.cumulativeAmount);
-    const txHash = await Chain.settleOnChain(client, channel.descriptor, amount, channel.highestVoucher.signature, escrow, account
+    const { signature } = channel.highestVoucher;
+    // A replica behind the open or top-up that admitted this voucher rejects the settle while
+    // preparing it (e.g. `ChannelNotFound`); nothing was broadcast, so retry until it catches up.
+    const txHash = await Chain.readbackWithRetry(() => Chain.settleOnChain(client, channel.descriptor, amount, signature, escrow, account
         ? {
             account,
             ...(options?.feePayer ? { feePayer: options.feePayer } : {}),
@@ -315,7 +318,7 @@ export async function settle(store_, client, channelId_, options) {
             ...(options?.feeToken ? { feeToken: options.feeToken } : {}),
             candidateFeeTokens: options?.candidateFeeTokens ?? [channel.token],
         }
-        : undefined);
+        : undefined), { shouldRetry: isExecutionRevert });
     const receipt = await Chain.waitForSuccessfulReceipt(client, txHash);
     const settled = readSettledReceiptFields(Chain.getChannelEvent(receipt, 'Settled', channelId));
     const { deltaPaid, newSettled } = settled;
@@ -389,6 +392,11 @@ export function ignoreRetryableSettlementFailure(error) {
         return undefined;
     throw error;
 }
+/** Whether a settlement failed because the node's execution reverted it. */
+function isExecutionRevert(error) {
+    return (error instanceof viem_BaseError &&
+        Boolean(error.walk((cause) => cause instanceof ExecutionRevertedError)));
+}
 function isRetryableSettlementFailure(error) {
     if (error instanceof SettlementLeaseError)
         return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mppx",
   "type": "module",
-  "version": "0.13.4",
+  "version": "0.13.5",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://github.com/wevm/mppx#readme",