mppx 0.6.31 → 0.8.0

package/dist/tempo/server/Methods.d.ts

@@ -1,16 +1,25 @@
-import * as Ws_ from '../session/Ws.js';
+import { session as sessionLegacy_, settle as settleLegacy_ } from '../legacy/server/index.js';
+import { charge as sessionCharge_, session as session_, settle as settle_, settleBatch as settleBatch_ } from '../session/server/Session.js';
+import * as Ws_ from '../session/server/Ws.js';
 import { charge as charge_ } from './Charge.js';
-import { session as session_, settle as settle_ } from './Session.js';
 import { renew as renewSubscription_, subscription as subscription_ } from './Subscription.js';
+declare function createSessionLegacyMethod<const parameters extends NonNullable<Parameters<typeof sessionLegacy_>[0]>>(parameters?: parameters): never;
+/** Creates a legacy contract-backed Tempo `session` server method. */
+export declare const sessionLegacy: typeof createSessionLegacyMethod & {
+    settle: typeof settleLegacy_;
+    Ws: typeof Ws_;
+};
+/** Settles a legacy contract-backed Tempo session channel. */
+export declare const settleLegacy: typeof settleLegacy_;
 /**
- * Creates both Tempo `charge` and `session` methods from shared parameters.
+ * Creates the common Tempo `charge` and `session` methods from shared parameters.
  *
  * @example
  * ```ts
  * import { Mppx, tempo } from 'mppx/server'
  *
  * const mppx = Mppx.create({
- *   methods: [tempo({ currency: '0x...', recipient: '0x...' })],
+ *   methods: [tempo.common({ currency: '0x...', recipient: '0x...' })],
  * })
  * ```
  */
@@ -84,7 +93,15 @@ export declare function tempo<const parameters extends tempo.Parameters>(paramet
             supportedModes?: ("push" | "pull")[] | undefined;
         }>>;
     };
-}, never, undefined, {}>, import("../../Method.js").Server<{
+}, charge_.DeriveDefaults<{
+    html?: boolean | import("../../Html.js").Config | undefined;
+    feePayerPolicy?: charge_.FeePayerPolicy | undefined;
+    testnet?: boolean | undefined;
+    store?: import("../../Store.js").AtomicStore | undefined;
+    validateSender?: charge_.ValidateSender | undefined;
+    storeKeyPrefix?: string | undefined;
+    waitForConfirmation?: boolean | undefined;
+} & import("../../viem/Client.js").getResolver.Parameters & import("../internal/account.js").resolve.Parameters & charge_.Defaults>, undefined, {}, undefined>, import("../../Method.js").Server<{
     readonly name: "tempo";
     readonly intent: "session";
     readonly schema: {
@@ -94,6 +111,7 @@ export declare function tempo<const parameters extends tempo.Parameters>(paramet
                 authorizedSigner: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniString<string>>;
                 channelId: import("zod/mini").ZodMiniString<string>;
                 cumulativeAmount: import("zod/mini").ZodMiniString<string>;
+                descriptor: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniCustom<import("../session/precompile/Protocol.js").ChannelDescriptor, import("../session/precompile/Protocol.js").ChannelDescriptor>>;
                 signature: import("zod/mini").ZodMiniString<string>;
                 transaction: import("zod/mini").ZodMiniString<string>;
                 type: import("zod/mini").ZodMiniLiteral<"transaction">;
@@ -101,17 +119,20 @@ export declare function tempo<const parameters extends tempo.Parameters>(paramet
                 action: import("zod/mini").ZodMiniLiteral<"topUp">;
                 additionalDeposit: import("zod/mini").ZodMiniString<string>;
                 channelId: import("zod/mini").ZodMiniString<string>;
+                descriptor: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniCustom<import("../session/precompile/Protocol.js").ChannelDescriptor, import("../session/precompile/Protocol.js").ChannelDescriptor>>;
                 transaction: import("zod/mini").ZodMiniString<string>;
                 type: import("zod/mini").ZodMiniLiteral<"transaction">;
             }, import("zod/v4/core").$strip>, import("zod/mini").ZodMiniObject<{
                 action: import("zod/mini").ZodMiniLiteral<"voucher">;
                 channelId: import("zod/mini").ZodMiniString<string>;
                 cumulativeAmount: import("zod/mini").ZodMiniString<string>;
+                descriptor: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniCustom<import("../session/precompile/Protocol.js").ChannelDescriptor, import("../session/precompile/Protocol.js").ChannelDescriptor>>;
                 signature: import("zod/mini").ZodMiniString<string>;
             }, import("zod/v4/core").$strip>, import("zod/mini").ZodMiniObject<{
                 action: import("zod/mini").ZodMiniLiteral<"close">;
                 channelId: import("zod/mini").ZodMiniString<string>;
                 cumulativeAmount: import("zod/mini").ZodMiniString<string>;
+                descriptor: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniCustom<import("../session/precompile/Protocol.js").ChannelDescriptor, import("../session/precompile/Protocol.js").ChannelDescriptor>>;
                 signature: import("zod/mini").ZodMiniString<string>;
             }, import("zod/v4/core").$strip>], "action">;
         };
@@ -124,11 +145,20 @@ export declare function tempo<const parameters extends tempo.Parameters>(paramet
             escrowContract: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniString<string>>;
             feePayer: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniPipe<import("zod/mini").ZodMiniUnion<readonly [import("zod/mini").ZodMiniBoolean<boolean>, import("zod/mini").ZodMiniCustom<import("viem").Account, import("viem").Account>]>, import("zod/mini").ZodMiniTransform<boolean, boolean | import("viem").Account>>>;
             minVoucherDelta: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniString<string>>;
+            operator: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniString<string>>;
             recipient: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniString<string>>;
+            sessionProtocol: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniEnum<{
+                v1: "v1";
+                v2: "v2";
+            }>>;
+            sessionSnapshot: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniCustom<import("../session/Snapshot.js").SessionSnapshot, import("../session/Snapshot.js").SessionSnapshot>>;
             suggestedDeposit: import("zod/mini").ZodMiniOptional<import("zod/mini").ZodMiniString<string>>;
             unitType: import("zod/mini").ZodMiniString<string>;
         }, import("zod/v4/core").$strip>, import("zod/mini").ZodMiniTransform<{
             methodDetails: {
+                sessionSnapshot?: import("../session/Snapshot.js").SessionSnapshot | undefined;
+                sessionProtocol?: "v1" | "v2" | undefined;
+                operator?: string | undefined;
                 feePayer?: boolean | undefined;
                 chainId?: number | undefined;
                 minVoucherDelta?: string | undefined;
@@ -150,24 +180,53 @@ export declare function tempo<const parameters extends tempo.Parameters>(paramet
             escrowContract?: string | undefined;
             feePayer?: boolean | undefined;
             minVoucherDelta?: string | undefined;
+            operator?: string | undefined;
             recipient?: string | undefined;
+            sessionProtocol?: "v1" | "v2" | undefined;
+            sessionSnapshot?: import("../session/Snapshot.js").SessionSnapshot | undefined;
             suggestedDeposit?: string | undefined;
         }>>;
     };
-}, never, undefined, {}>];
+}, session_.DeriveDefaults<{
+    channelStateTtl?: number | undefined;
+    feePayerPolicy?: session_.FeePayerPolicy | undefined;
+    minVoucherDelta?: string | undefined;
+    resolveChannelId?: import("../session/server/RequestState.js").ResolveSessionChannelId | undefined;
+    bootstrap?: boolean | undefined;
+    store?: import("../../Store.js").AtomicStore | undefined;
+    sse?: boolean | import("./internal/transport.js").sse.Options | undefined;
+    chainId?: number | undefined;
+    escrowContract?: import("viem").Address | undefined;
+    settlementSchedule?: import("../session/server/Settlement.js").SettlementSchedule | undefined;
+    feeToken?: import("viem").Address | undefined;
+} & import("../internal/account.js").resolve.Parameters & import("../../viem/Client.js").getResolver.Parameters & session_.Defaults>, import("./internal/transport.js").Sse, {}, undefined>];
 export declare namespace tempo {
     type Parameters = charge_.Parameters & session_.Parameters;
     /** Creates a Tempo `charge` method for one-time TIP-20 token transfers. */
     const charge: typeof charge_;
-    /** Creates a Tempo `session` method for session-based TIP-20 token payments. */
-    const session: typeof session_;
+    /** Creates the common Tempo `charge` and `session` methods from shared parameters. */
+    const common: typeof tempo;
+    /** Creates a TIP-1034 Tempo `session` method for session-based TIP-20 token payments. */
+    const session: typeof session_ & {
+        charge: typeof sessionCharge_;
+        settle: typeof settle_;
+        settleBatch: typeof settleBatch_;
+    };
+    /** @deprecated Use `tempo.session()` for the TIP-1034 session server method. */
+    const sessionLegacy: typeof createSessionLegacyMethod & {
+        settle: typeof settleLegacy_;
+        Ws: typeof Ws_;
+    };
     /** Creates a Tempo `subscription` method for recurring TIP-20 token payments. */
     const subscription: typeof subscription_;
     /** Renews an overdue Tempo subscription outside of the HTTP request path. */
     const renewSubscription: typeof renewSubscription_;
     /** One-shot settle: reads highest voucher from storage and submits on-chain. */
     const settle: typeof settle_;
+    /** Batch-settle precompile-backed session channels. */
+    const settleBatch: typeof settleBatch_;
     /** Experimental websocket helpers for Tempo sessions. */
     const Ws: typeof Ws_;
 }
+export {};
 //# sourceMappingURL=Methods.d.ts.map

package/dist/tempo/server/Methods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Methods.d.ts","sourceRoot":"","sources":["../../../src/tempo/server/Methods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,cAAc,CAAA;AACrE,OAAO,EAAE,KAAK,IAAI,kBAAkB,EAAE,YAAY,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE9F;;;;;;;;;;;GAWG;AACH,wBAAgB,KAAK,CAAC,KAAK,CAAC,UAAU,SAAS,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAKvF;AAED,yBAAiB,KAAK,CAAC;IACrB,KAAY,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;IAEjE,2EAA2E;IACpE,MAAM,MAAM,gBAAU,CAAA;IAC7B,gFAAgF;IACzE,MAAM,OAAO,iBAAW,CAAA;IAC/B,iFAAiF;IAC1E,MAAM,YAAY,sBAAgB,CAAA;IACzC,6EAA6E;IACtE,MAAM,iBAAiB,2BAAqB,CAAA;IACnD,gFAAgF;IACzE,MAAM,MAAM,gBAAU,CAAA;IAC7B,yDAAyD;IAClD,MAAM,EAAE,YAAM,CAAA;CACtB"}
+{"version":3,"file":"Methods.d.ts","sourceRoot":"","sources":["../../../src/tempo/server/Methods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9F,OAAO,EACL,MAAM,IAAI,cAAc,EACxB,OAAO,IAAI,QAAQ,EACnB,MAAM,IAAI,OAAO,EACjB,WAAW,IAAI,YAAY,EAC5B,MAAM,8BAA8B,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAC9C,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,KAAK,IAAI,kBAAkB,EAAE,YAAY,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAQ9F,iBAAS,yBAAyB,CAChC,KAAK,CAAC,UAAU,SAAS,WAAW,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,EAC1E,UAAU,CAAC,EAAE,UAAU,SAExB;AAOD,sEAAsE;AACtE,eAAO,MAAM,aAAa;;;CAAsB,CAAA;AAEhD,8DAA8D;AAC9D,eAAO,MAAM,YAAY,sBAAgB,CAAA;AAkBzC;;;;;;;;;;;GAWG;AACH,wBAAgB,KAAK,CAAC,KAAK,CAAC,UAAU,SAAS,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6LAEvF;AAED,yBAAiB,KAAK,CAAC;IACrB,KAAY,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;IAEjE,2EAA2E;IACpE,MAAM,MAAM,gBAAU,CAAA;IAC7B,sFAAsF;IAC/E,MAAM,MAAM,cAAQ,CAAA;IAC3B,yFAAyF;IAClF,MAAM,OAAO;;;;KAAgB,CAAA;IACpC,gFAAgF;IACzE,MAAM,aAAa;;;KAAsB,CAAA;IAChD,iFAAiF;IAC1E,MAAM,YAAY,sBAAgB,CAAA;IACzC,6EAA6E;IACtE,MAAM,iBAAiB,2BAAqB,CAAA;IACnD,gFAAgF;IACzE,MAAM,MAAM,gBAAU,CAAA;IAC7B,uDAAuD;IAChD,MAAM,WAAW,qBAAe,CAAA;IACvC,yDAAyD;IAClD,MAAM,EAAE,YAAM,CAAA;CACtB"}

package/dist/tempo/server/Methods.js

@@ -1,36 +1,66 @@
-import * as Ws_ from '../session/Ws.js';
+import { session as sessionLegacy_, settle as settleLegacy_ } from '../legacy/server/index.js';
+import { charge as sessionCharge_, session as session_, settle as settle_, settleBatch as settleBatch_, } from '../session/server/Session.js';
+import * as Ws_ from '../session/server/Ws.js';
 import { charge as charge_ } from './Charge.js';
-import { session as session_, settle as settle_ } from './Session.js';
 import { renew as renewSubscription_, subscription as subscription_ } from './Subscription.js';
+const sessionServer = Object.assign(session_, {
+    charge: sessionCharge_,
+    settle: settle_,
+    settleBatch: settleBatch_,
+});
+function createSessionLegacyMethod(parameters) {
+    return Object.assign(sessionLegacy_(parameters), { alias: 'sessionLegacy' });
+}
+const sessionLegacyServer = Object.assign(createSessionLegacyMethod, {
+    settle: settleLegacy_,
+    Ws: Ws_,
+});
+/** Creates a legacy contract-backed Tempo `session` server method. */
+export const sessionLegacy = sessionLegacyServer;
+/** Settles a legacy contract-backed Tempo session channel. */
+export const settleLegacy = settleLegacy_;
+function createChargeMethod(parameters) {
+    // `tempo()` accepts the intersection of charge/session parameters, then
+    // forwards only the fields each method understands. Keep the generic bridge
+    // out of the public control-flow body.
+    return tempo.charge(parameters);
+}
+function createSessionMethod(parameters) {
+    // See `createChargeMethod()`: session receives the same shared parameter bag.
+    return sessionServer(parameters);
+}
 /**
- * Creates both Tempo `charge` and `session` methods from shared parameters.
+ * Creates the common Tempo `charge` and `session` methods from shared parameters.
  *
  * @example
  * ```ts
  * import { Mppx, tempo } from 'mppx/server'
  *
  * const mppx = Mppx.create({
- *   methods: [tempo({ currency: '0x...', recipient: '0x...' })],
+ *   methods: [tempo.common({ currency: '0x...', recipient: '0x...' })],
  * })
  * ```
  */
 export function tempo(parameters) {
-    return [
-        tempo.charge(parameters),
-        tempo.session(parameters),
-    ];
+    return [createChargeMethod(parameters), createSessionMethod(parameters)];
 }
 (function (tempo) {
     /** Creates a Tempo `charge` method for one-time TIP-20 token transfers. */
     tempo.charge = charge_;
-    /** Creates a Tempo `session` method for session-based TIP-20 token payments. */
-    tempo.session = session_;
+    /** Creates the common Tempo `charge` and `session` methods from shared parameters. */
+    tempo.common = tempo;
+    /** Creates a TIP-1034 Tempo `session` method for session-based TIP-20 token payments. */
+    tempo.session = sessionServer;
+    /** @deprecated Use `tempo.session()` for the TIP-1034 session server method. */
+    tempo.sessionLegacy = sessionLegacyServer;
     /** Creates a Tempo `subscription` method for recurring TIP-20 token payments. */
     tempo.subscription = subscription_;
     /** Renews an overdue Tempo subscription outside of the HTTP request path. */
     tempo.renewSubscription = renewSubscription_;
     /** One-shot settle: reads highest voucher from storage and submits on-chain. */
     tempo.settle = settle_;
+    /** Batch-settle precompile-backed session channels. */
+    tempo.settleBatch = settleBatch_;
     /** Experimental websocket helpers for Tempo sessions. */
     tempo.Ws = Ws_;
 })(tempo || (tempo = {}));

package/dist/tempo/server/Methods.js.map

@@ -1 +1 @@
-{"version":3,"file":"Methods.js","sourceRoot":"","sources":["../../../src/tempo/server/Methods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,cAAc,CAAA;AACrE,OAAO,EAAE,KAAK,IAAI,kBAAkB,EAAE,YAAY,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE9F;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,KAAK,CAA4C,UAAuB;IACtF,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,UAAyC,CAAC;QACvD,KAAK,CAAC,OAAO,CAAC,UAA0C,CAAC;KACjD,CAAA;AACZ,CAAC;AAED,WAAiB,KAAK;IAGpB,2EAA2E;IAC9D,YAAM,GAAG,OAAO,CAAA;IAC7B,gFAAgF;IACnE,aAAO,GAAG,QAAQ,CAAA;IAC/B,iFAAiF;IACpE,kBAAY,GAAG,aAAa,CAAA;IACzC,6EAA6E;IAChE,uBAAiB,GAAG,kBAAkB,CAAA;IACnD,gFAAgF;IACnE,YAAM,GAAG,OAAO,CAAA;IAC7B,yDAAyD;IAC5C,QAAE,GAAG,GAAG,CAAA;AACvB,CAAC,EAfgB,KAAK,KAAL,KAAK,QAerB"}
+{"version":3,"file":"Methods.js","sourceRoot":"","sources":["../../../src/tempo/server/Methods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9F,OAAO,EACL,MAAM,IAAI,cAAc,EACxB,OAAO,IAAI,QAAQ,EACnB,MAAM,IAAI,OAAO,EACjB,WAAW,IAAI,YAAY,GAC5B,MAAM,8BAA8B,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAC9C,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,KAAK,IAAI,kBAAkB,EAAE,YAAY,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE9F,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;IAC5C,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,OAAO;IACf,WAAW,EAAE,YAAY;CAC1B,CAAC,CAAA;AAEF,SAAS,yBAAyB,CAEhC,UAAuB;IACvB,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,UAAmB,CAAC,EAAE,EAAE,KAAK,EAAE,eAAwB,EAAE,CAAC,CAAA;AAChG,CAAC;AAED,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,yBAAyB,EAAE;IACnE,MAAM,EAAE,aAAa;IACrB,EAAE,EAAE,GAAG;CACR,CAAC,CAAA;AAEF,sEAAsE;AACtE,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAEhD,8DAA8D;AAC9D,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAA;AAEzC,SAAS,kBAAkB,CACzB,UAAkC;IAElC,wEAAwE;IACxE,4EAA4E;IAC5E,uCAAuC;IACvC,OAAO,KAAK,CAAC,MAAM,CAAC,UAAgC,CAAC,CAAA;AACvD,CAAC;AAED,SAAS,mBAAmB,CAC1B,UAAkC;IAElC,8EAA8E;IAC9E,OAAO,aAAa,CAAC,UAAiC,CAAC,CAAA;AACzD,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,KAAK,CAA4C,UAAuB;IACtF,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,CAAU,CAAA;AACnF,CAAC;AAED,WAAiB,KAAK;IAGpB,2EAA2E;IAC9D,YAAM,GAAG,OAAO,CAAA;IAC7B,sFAAsF;IACzE,YAAM,GAAG,KAAK,CAAA;IAC3B,yFAAyF;IAC5E,aAAO,GAAG,aAAa,CAAA;IACpC,gFAAgF;IACnE,mBAAa,GAAG,mBAAmB,CAAA;IAChD,iFAAiF;IACpE,kBAAY,GAAG,aAAa,CAAA;IACzC,6EAA6E;IAChE,uBAAiB,GAAG,kBAAkB,CAAA;IACnD,gFAAgF;IACnE,YAAM,GAAG,OAAO,CAAA;IAC7B,uDAAuD;IAC1C,iBAAW,GAAG,YAAY,CAAA;IACvC,yDAAyD;IAC5C,QAAE,GAAG,GAAG,CAAA;AACvB,CAAC,EArBgB,KAAK,KAAL,KAAK,QAqBrB"}

package/dist/tempo/server/Subscription.d.ts

@@ -102,7 +102,7 @@ export declare function subscription<const parameters extends subscription.Param
             } | undefined;
         }>>;
     };
-}, subscription.DeriveDefaults<parameters>, undefined, subscription.Extensions>;
+}, subscription.DeriveDefaults<parameters>, undefined, subscription.Extensions, undefined>;
 /**
  * Renews an overdue subscription outside of the HTTP request path.
  * Intended for cron jobs or background workers that bill subscriptions on a schedule.
@@ -181,6 +181,11 @@ export declare namespace subscription {
          * Keeps concurrent renewal safe while allowing recovery from abandoned attempts.
          */
         renewalTimeoutMs?: number | undefined;
+        /**
+         * Requires a fresh subscription Credential even when a subscription is active.
+         * This binds access reuse to the stored payer instead of trusting request metadata alone.
+         */
+        requireCredential?: boolean | undefined;
         /**
          * Override the fee-payer policy for sponsored subscription payments.
          * Useful when the access key + key authorization tx requires more gas
@@ -223,6 +228,11 @@ export declare namespace subscription {
         resolve: (parameters: {
             input: Request;
             request: SubscriptionRequest;
+            /** Verified payer identity recovered from a signed subscription credential. */
+            source?: {
+                address: Address;
+                chainId: number;
+            } | undefined;
         }) => MaybePromise<ResolvedSubscription | null>;
         renew?: (parameters: {
             /** Stable idempotency/reconciliation reference persisted before the renewal hook runs. */

package/dist/tempo/server/Subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Subscription.d.ts","sourceRoot":"","sources":["../../../src/tempo/server/Subscription.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Subscription.d.ts","sourceRoot":"","sources":["../../../src/tempo/server/Subscription.ts"],"names":[],"mappings":"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"}

package/dist/tempo/server/Subscription.js

@@ -1,6 +1,6 @@
 import { Base64 } from 'ox';
 import { KeyAuthorization } from 'ox/tempo';
-import { encodeFunctionData, isAddressEqual } from 'viem';
+import { encodeFunctionData, isAddressEqual, parseEventLogs, } from 'viem';
 import { call as viem_call, prepareTransactionRequest, sendRawTransaction, sendRawTransactionSync, signTransaction, } from 'viem/actions';
 import { Abis, Account as TempoAccount, Transaction } from 'viem/tempo';
 import { tempo as tempo_chain } from 'viem/tempo/chains';
@@ -64,6 +64,8 @@ export function subscription(p) {
             }),
         },
         async authorize({ input, request }) {
+            if (parameters.requireCredential)
+                return undefined;
             const resolved = await parameters.resolve({ input, request });
             if (!resolved)
                 return undefined;
@@ -132,15 +134,19 @@ export function subscription(p) {
             const input = requestFromCaptured(capturedRequest);
             const resolved = await parameters.resolve({ input, request: parsedRequest });
             const existing = resolved ? await store.getByKey(resolved.key) : null;
-            const accessKey = resolved && !credential
-                ? await resolveChallengeAccessKey({
-                    existing,
-                    input,
-                    parameters,
-                    request: parsedRequest,
-                    resolved,
-                    store,
-                })
+            const accessKey = !credential
+                ? resolved
+                    ? await resolveChallengeAccessKey({
+                        existing,
+                        input,
+                        parameters,
+                        request: parsedRequest,
+                        resolved,
+                        store,
+                    })
+                    : parameters.requireCredential && !parameters.activate
+                        ? await createUnboundChallengeAccessKey({ store })
+                        : undefined
                 : (credentialRequest?.methodDetails?.accessKey ?? parsedRequest.methodDetails?.accessKey);
             if (!accessKey) {
                 throw new VerificationFailedError({ reason: 'subscription accessKey is missing' });
@@ -164,14 +170,16 @@ export function subscription(p) {
                 challengeExpires: credential.challenge.expires,
                 request: parsedRequest,
             });
-            const resolved = await parameters.resolve({ input, request: parsedRequest });
-            if (!resolved) {
-                throw new VerificationFailedError({ reason: 'subscription could not be resolved' });
-            }
             const challengeRequest = credential.challenge.request;
-            const accessKey = challengeRequest.methodDetails?.accessKey ??
-                parsedRequest.methodDetails?.accessKey ??
-                (await resolveAccessKey({ input, parameters, request: parsedRequest, resolved }));
+            let resolved = null;
+            let accessKey = challengeRequest.methodDetails?.accessKey ?? parsedRequest.methodDetails?.accessKey;
+            if (!accessKey) {
+                resolved = await parameters.resolve({ input, request: parsedRequest });
+                if (!resolved) {
+                    throw new VerificationFailedError({ reason: 'subscription could not be resolved' });
+                }
+                accessKey = await resolveAccessKey({ input, parameters, request: parsedRequest, resolved });
+            }
             if (!accessKey) {
                 throw new VerificationFailedError({ reason: 'subscription accessKey is missing' });
             }
@@ -189,9 +197,17 @@ export function subscription(p) {
                     reason: 'credential source does not match signature',
                 });
             }
+            resolved =
+                (await parameters.resolve({ input, request: parsedRequest, source: verified.source })) ??
+                    resolved;
+            if (!resolved) {
+                throw new VerificationFailedError({ reason: 'subscription could not be resolved' });
+            }
             const activation = await store.activate({
                 challengeId: credential.challenge.id,
-                isReusable: (subscription) => isReusableSubscription(subscription, parsedRequest),
+                isReusable: (subscription) => parameters.requireCredential
+                    ? isActiveSubscriptionForRequest(subscription, parsedRequest)
+                    : isReusableSubscription(subscription, parsedRequest),
                 lookupKey: resolved.key,
                 async create() {
                     const activation = withSubscriptionAccessKey(await activateSubscription({
@@ -235,7 +251,46 @@ export function subscription(p) {
                 throw new VerificationFailedError({ reason: 'subscription activation claim mismatch' });
             }
             if (activation.status === 'existing') {
-                return SubscriptionReceipt.fromRecord(activation.subscription);
+                const subscription = activation.subscription;
+                assertSubscriptionPayer(subscription, verified.source, {
+                    required: parameters.requireCredential,
+                });
+                const periodIndex = getPeriodIndex(subscription);
+                if (periodIndex > subscription.lastChargedPeriod) {
+                    const renew = resolveRenewalHandler({
+                        feePayer,
+                        feePayerPolicy,
+                        getClient,
+                        parameters,
+                        store,
+                        subscription,
+                        waitForConfirmation,
+                    });
+                    if (!renew) {
+                        throw new VerificationFailedError({ reason: 'subscription renewal is required' });
+                    }
+                    const renewal = await settleRenewal({
+                        expectedLookupKey: resolved.key,
+                        periodIndex,
+                        renew,
+                        request: parsedRequest,
+                        store,
+                        subscription,
+                    });
+                    if (!renewal) {
+                        throw new VerificationFailedError({ reason: 'subscription renewal failed' });
+                    }
+                    if (renewal.status === 'charged' || renewal.status === 'inFlight') {
+                        return renewal.receipt;
+                    }
+                    await parameters.hooks?.renewed?.({
+                        periodIndex,
+                        receipt: renewal.result.receipt,
+                        subscription: renewal.result.subscription,
+                    });
+                    return renewal.result.receipt;
+                }
+                return SubscriptionReceipt.fromRecord(subscription);
             }
             await parameters.hooks?.activated?.({
                 receipt: activation.result.receipt,
@@ -285,6 +340,13 @@ async function resolveChallengeAccessKey(parameters) {
     return ((await resolveAccessKey({ input, parameters: subscriptionParameters, request, resolved })) ??
         (existing && isActive(existing) ? existing.accessKey : undefined));
 }
+async function createUnboundChallengeAccessKey(parameters) {
+    const accessKey = await parameters.store.getOrCreateAccessKey(`challenge:${createSubscriptionId()}`);
+    return {
+        accessKeyAddress: accessKey.accessKeyAddress,
+        keyType: accessKey.keyType,
+    };
+}
 async function activateSubscription(parameters) {
     const { accessKey, auto, credential, input, parameters: subscriptionParameters, request, resolved, source, } = parameters;
     if (subscriptionParameters.activate) {
@@ -414,16 +476,30 @@ function isActive(subscription) {
         return false;
     return new Date(subscription.subscriptionExpires).getTime() > Date.now();
 }
+function isActiveSubscriptionForRequest(subscription, request) {
+    return isActive(subscription) && subscriptionMatchesRequest(subscription, request);
+}
 function isReusableSubscription(subscription, request) {
-    return (isActive(subscription) &&
-        getPeriodIndex(subscription) <= subscription.lastChargedPeriod &&
-        subscriptionMatchesRequest(subscription, request));
+    return (isActiveSubscriptionForRequest(subscription, request) &&
+        getPeriodIndex(subscription) <= subscription.lastChargedPeriod);
 }
 function subscriptionMatchesRequest(subscription, request) {
     const actual = comparableSubscriptionBinding(subscription);
     const expected = comparableSubscriptionBinding(request);
     return Object.keys(expected).every((key) => actual[key] === expected[key]);
 }
+function assertSubscriptionPayer(subscription, source, options) {
+    if (!subscription.payer) {
+        if (options?.required) {
+            throw new VerificationFailedError({ reason: 'subscription payer is missing' });
+        }
+        return;
+    }
+    if (subscription.payer.chainId !== source.chainId ||
+        !isAddressEqual(subscription.payer.address, source.address)) {
+        throw new VerificationFailedError({ reason: 'subscription payer mismatch' });
+    }
+}
 function comparableSubscriptionBinding(value) {
     const chainId = 'chainId' in value ? value.chainId : value.methodDetails?.chainId;
     return {
@@ -558,7 +634,8 @@ function resolveRenewalHandler(parameters) {
 }
 async function submitSubscriptionPayment(parameters) {
     const { accessKey, feePayer, feePayerPolicy, getClient, keyAuthorization, lookupKey, request, settlementReference, source, store, waitForConfirmation, } = parameters;
-    const stored = await store.getAccessKey(lookupKey);
+    const stored = (await store.getAccessKey(lookupKey)) ??
+        (await store.getAccessKeyByAddress(accessKey.accessKeyAddress));
     if (!stored) {
         throw new VerificationFailedError({ reason: 'subscription access key is missing' });
     }
@@ -633,6 +710,8 @@ async function submitSubscriptionPayment(parameters) {
         feePayerSignature: undefined,
     });
     if (!waitForConfirmation) {
+        // Optimistic mode has no receipt to inspect, so it cannot detect a T6
+        // (TIP-1028) held transfer. Use `waitForConfirmation: true` for T6-safe proof.
         return sendRawTransaction(client, {
             serializedTransaction: serializedTransaction,
         });
@@ -645,8 +724,41 @@ async function submitSubscriptionPayment(parameters) {
             reason: `subscription transaction reverted: ${receipt.transactionHash}`,
         });
     }
+    assertSubscriptionTransfer(receipt, {
+        amount: BigInt(request.amount),
+        currency: request.currency,
+        memo,
+        recipient: request.recipient,
+    });
     return receipt.transactionHash;
 }
+/**
+ * Asserts a confirmed subscription payment credited the recipient.
+ *
+ * Transaction success alone is not proof: under Tempo T6 (TIP-1028) a recipient
+ * receive policy can hold the funds in `ReceivePolicyGuard` while the tx still
+ * succeeds. Settlement always emits one `transferWithMemo(recipient, amount,
+ * memo)`, so this requires a matching `TransferWithMemo` log on the expected
+ * token. A held transfer fails because its `to` is the guard, and the memo
+ * binding excludes unrelated transfer effects in the same receipt.
+ */
+function assertSubscriptionTransfer(receipt, parameters) {
+    const { amount, currency, memo, recipient } = parameters;
+    const credited = parseEventLogs({
+        abi: Abis.tip20,
+        eventName: 'TransferWithMemo',
+        logs: receipt.logs,
+    }).some((log) => isAddressEqual(log.address, currency) &&
+        isAddressEqual(log.args.to, recipient) &&
+        log.args.amount === amount &&
+        log.args.memo.toLowerCase() === memo.toLowerCase());
+    if (!credited) {
+        throw new VerificationFailedError({
+            reason: `subscription transfer was not credited to the recipient ` +
+                `(funds may have been held by a receive policy): ${receipt.transactionHash}`,
+        });
+    }
+}
 function createSubscriptionId() {
     const bytes = new Uint8Array(18);
     globalThis.crypto.getRandomValues(bytes);