mppx 0.14.1 → 0.16.0

package/dist/tempo/server/Subscription.js

@@ -314,7 +314,6 @@ export function subscription(p) {
 }
 // Access-key provisioning can cost around 4M gas.
 const defaultFeePayerPolicy = {
-    allowKeyAuthorization: true,
     maxGas: 5000000n,
     maxTotalFee: 200000000000000000n,
 };
@@ -353,10 +352,11 @@ async function resolveChallengeAccessKey(parameters) {
         (existing && isActive(existing) ? existing.accessKey : undefined));
 }
 async function createUnboundChallengeAccessKey(parameters) {
-    const accessKey = await parameters.store.getOrCreateAccessKey(`challenge:${createSubscriptionId()}`);
+    const accessKey = await parameters.store.createChallengeAccessKey();
     return {
         accessKeyAddress: accessKey.accessKeyAddress,
         keyType: accessKey.keyType,
+        keyToken: accessKey.keyToken,
     };
 }
 async function activateSubscription(parameters) {
@@ -646,8 +646,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)) ??
-        (await store.getAccessKeyByAddress(accessKey.accessKeyAddress));
+    const stored = (await store.getAccessKeyByAddress(accessKey.accessKeyAddress, accessKey.keyToken)) ??
+        (await store.getAccessKey(lookupKey));
     if (!stored) {
         throw new VerificationFailedError({ reason: 'subscription access key is missing' });
     }
@@ -754,9 +754,11 @@ async function submitSubscriptionPayment(parameters) {
     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, {
+        const hash = await sendRawTransaction(client, {
             serializedTransaction: serializedTransaction,
         });
+        await store.retainAccessKey(lookupKey, stored);
+        return hash;
     }
     const receipt = await sendRawTransactionSync(client, {
         serializedTransaction: serializedTransaction,
@@ -772,6 +774,7 @@ async function submitSubscriptionPayment(parameters) {
         memo,
         recipient: request.recipient,
     });
+    await store.retainAccessKey(lookupKey, stored);
     return receipt.transactionHash;
 }
 /**