mppx 0.6.25 → 0.6.26

package/src/tempo/subscription/KeyAuthorization.test.ts

@@ -11,6 +11,8 @@ import {
   toSubscriptionExpiryDate,
   toSubscriptionExpirySeconds,
   toSubscriptionPeriodSeconds,
+  transferSelector,
+  transferWithMemoSelector,
   verifySubscriptionKeyAuthorization,
 } from './KeyAuthorization.js'
 import type { SubscriptionAccessKey } from './Types.js'
@@ -89,13 +91,12 @@ describe('tempo subscription key authorization', () => {
     const request = parseRequest()
 
     expect(getSubscriptionScopes(request)).toMatchObject([
-      { address: currency, recipients: [recipient] },
-      { address: currency, recipients: [recipient] },
+      { address: currency, recipients: [recipient], selector: transferWithMemoSelector },
     ])
     expect(getSubscriptionRpcAllowedCalls(request)).toMatchObject([
       {
         target: currency,
-        selectorRules: [{ recipients: [recipient] }, { recipients: [recipient] }],
+        selectorRules: [{ recipients: [recipient], selector: transferWithMemoSelector }],
       },
     ])
   })
@@ -158,7 +159,10 @@ describe('tempo subscription key authorization', () => {
     const authorization = KeyAuthorization.deserialize(payload.signature)
     const transferOnly = KeyAuthorization.serialize({
       ...authorization,
-      scopes: authorization.scopes?.slice(0, 1),
+      scopes: authorization.scopes?.map((scope) => ({
+        ...scope,
+        selector: transferSelector,
+      })),
     })
 
     expect(() =>
@@ -183,6 +187,11 @@ describe('tempo subscription key authorization', () => {
     ).toThrow('subscription period cannot be represented exactly by this Tempo client')
   })
 
+  test('accepts dev-prefixed subscription periods for development and tests', () => {
+    expect(toSubscriptionPeriodSeconds({ periodCount: '15', periodUnit: 'dev_second' })).toBe(15)
+    expect(toSubscriptionPeriodSeconds({ periodCount: '120', periodUnit: 'dev_second' })).toBe(120)
+  })
+
   test('rejects subscription expiries that cannot be represented by Tempo key authorizations', () => {
     expect(() =>
       toSubscriptionExpirySeconds(toSubscriptionExpiryDate('2026-01-01T00:00:00.500Z')),

package/src/tempo/subscription/KeyAuthorization.ts

@@ -12,12 +12,15 @@ import type {
 /** 4-byte selector for TIP-20 `transfer(address,uint256)`. */
 export const transferSelector = '0xa9059cbb'
 
-/** 4-byte selector for TIP-20 `transferWithMemo(address,uint256,bytes)`. */
+/** 4-byte selector for TIP-20 `transferWithMemo(address,uint256,bytes32)`. */
 export const transferWithMemoSelector = '0x95777d59'
 
 const uint64Max = (1n << 64n) - 1n
-const secondsPerDay = 86_400n
-const secondsPerWeek = 604_800n
+const subscriptionPeriodUnitSeconds = {
+  dev_second: 1n,
+  day: 86_400n,
+  week: 604_800n,
+} satisfies Record<SubscriptionPeriodUnit, bigint>
 
 type SubscriptionRequest = ReturnType<typeof Methods.subscription.schema.request.parse>
 type Authorization = KeyAuthorization.KeyAuthorization
@@ -63,11 +66,11 @@ export function toSubscriptionPeriodSeconds(request: {
   if (!/^[1-9]\d*$/.test(request.periodCount)) {
     throw new VerificationFailedError({ reason: 'periodCount is invalid' })
   }
-  if (request.periodUnit !== 'day' && request.periodUnit !== 'week') {
+  const unitSeconds = subscriptionPeriodUnitSeconds[request.periodUnit]
+  if (unitSeconds === undefined) {
     throw new VerificationFailedError({ reason: 'periodUnit is invalid' })
   }
 
-  const unitSeconds = request.periodUnit === 'day' ? secondsPerDay : secondsPerWeek
   const value = BigInt(request.periodCount) * unitSeconds
   if (value > uint64Max) {
     throw new VerificationFailedError({
@@ -113,11 +116,6 @@ export function getSubscriptionScopes(
   const currency = normalizeAddress(request.currency, 'currency')
   const recipient = normalizeAddress(request.recipient, 'recipient')
   return [
-    {
-      address: currency,
-      selector: transferSelector,
-      recipients: [recipient],
-    },
     {
       address: currency,
       selector: transferWithMemoSelector,
@@ -130,15 +128,11 @@ export function getSubscriptionScopes(
 export function getSubscriptionRpcAllowedCalls(
   request: Pick<SubscriptionRequest, 'currency' | 'recipient'>,
 ) {
-  const [transfer, transferWithMemo] = getSubscriptionScopes(request)
+  const [transferWithMemo] = getSubscriptionScopes(request)
   return [
     {
       target: normalizeAddress(request.currency, 'currency'),
       selectorRules: [
-        {
-          selector: transfer.selector,
-          recipients: transfer.recipients,
-        },
         {
           selector: transferWithMemo.selector,
           recipients: transferWithMemo.recipients,
@@ -325,9 +319,9 @@ function assertAuthorizationScopes(
   scopes: readonly KeyAuthorization.Scope[] | undefined,
   request: Pick<SubscriptionRequest, 'currency' | 'recipient'>,
 ) {
-  if (!scopes || scopes.length < 1 || scopes.length > 2) {
+  if (!scopes || scopes.length !== 1) {
     throw new VerificationFailedError({
-      reason: 'keyAuthorization must contain recipient-scoped transfer calls',
+      reason: 'keyAuthorization must contain a recipient-scoped transferWithMemo call',
     })
   }
 
@@ -353,9 +347,6 @@ function assertAuthorizationScopes(
     }
   }
 
-  if (!seen.has(transferSelector)) {
-    throw new VerificationFailedError({ reason: 'keyAuthorization must allow transfer' })
-  }
   if (!seen.has(transferWithMemoSelector)) {
     throw new VerificationFailedError({ reason: 'keyAuthorization must allow transferWithMemo' })
   }

package/src/tempo/subscription/Types.ts

@@ -1,7 +1,7 @@
 import type { Address } from 'viem'
 
-/** Tempo-supported subscription period units. The shared intent also defines `month`, but Tempo cannot represent calendar-month periods exactly. */
-export type SubscriptionPeriodUnit = 'day' | 'week'
+/** Tempo-supported subscription period units. Use `day` or `week` in production; `dev_*` units are for development and tests. */
+export type SubscriptionPeriodUnit = 'dev_second' | 'day' | 'week'
 
 /** Access key information used to authorize recurring Tempo payments. */
 export type SubscriptionAccessKey = {