@pafi-dev/issuer 0.5.15 → 0.5.17

package/dist/index.cjs

@@ -607,13 +607,7 @@ var RelayService = class {
         err
       );
     }
-    const operations = [
-      {
-        target: params.pointTokenAddress,
-        value: 0n,
-        data: burnCallData
-      }
-    ];
+    const operations = [];
     if (params.feeAmount && params.feeAmount > 0n) {
       if (!params.feeRecipient) {
         throw new RelayError(
@@ -637,6 +631,11 @@ var RelayService = class {
         })
       });
     }
+    operations.push({
+      target: params.pointTokenAddress,
+      value: 0n,
+      data: burnCallData
+    });
     return (0, import_core2.buildPartialUserOperation)({
       sender: params.userAddress,
       nonce: params.aaNonce,
@@ -1414,16 +1413,22 @@ var PTRedeemHandler = class {
     }
   }
   async _handleAfterNonceLock(request, burnNonce) {
+    const fee = request.feeAmount && request.feeAmount > 0n ? request.feeAmount : 0n;
+    if (fee > 0n && fee >= request.amount) {
+      throw new PTRedeemError(
+        "INVALID_AMOUNT",
+        `fee (${fee}) must be strictly less than redeem amount (${request.amount})`
+      );
+    }
     const onChainBalance = await (0, import_core4.getPointTokenBalance)(
       this.provider,
       this.pointTokenAddress,
       request.userAddress
     );
-    const totalRequired = request.amount + (request.feeAmount && request.feeAmount > 0n ? request.feeAmount : 0n);
-    if (onChainBalance < totalRequired) {
+    if (onChainBalance < request.amount) {
       throw new PTRedeemError(
         "INVALID_AMOUNT",
-        `insufficient on-chain PT balance: have ${onChainBalance}, need ${totalRequired}` + (request.feeAmount && request.feeAmount > 0n ? ` (${request.amount} burn + ${request.feeAmount} fee)` : "")
+        `insufficient on-chain PT balance: have ${onChainBalance}, need ${request.amount}`
       );
     }
     const deadline = BigInt(
@@ -1434,46 +1439,83 @@ var PTRedeemHandler = class {
       chainId: this.chainId,
       verifyingContract: this.domain.verifyingContract ?? this.pointTokenAddress
     };
-    const burnRequest = {
+    const sponsoredBurnAmount = request.amount - fee;
+    const sponsoredBurnRequest = {
       from: request.userAddress,
-      amount: request.amount,
+      amount: sponsoredBurnAmount,
       nonce: burnNonce,
       deadline
     };
-    let burnerSignature;
+    let sponsoredSig;
     try {
-      const sig = await (0, import_core4.signBurnRequest)(
-        this.burnerSignerWallet,
-        domain,
-        burnRequest
-      );
-      burnerSignature = sig.serialized;
+      sponsoredSig = (await (0, import_core4.signBurnRequest)(this.burnerSignerWallet, domain, sponsoredBurnRequest)).serialized;
     } catch (err) {
       throw new PTRedeemError(
         "SIGNING_FAILED",
-        `failed to sign BurnRequest: ${err instanceof Error ? err.message : String(err)}`
+        `failed to sign sponsored BurnRequest: ${err instanceof Error ? err.message : String(err)}`
       );
     }
-    const lockId = await this.ledger.reservePendingCredit(
+    const sponsoredLockId = await this.ledger.reservePendingCredit(
       request.userAddress,
-      request.amount,
+      sponsoredBurnAmount,
       this.redeemLockDurationMs,
       this.pointTokenAddress
     );
-    const userOp = this.relayService.prepareBurn({
+    const sponsoredUserOp = this.relayService.prepareBurn({
       mode: "burnWithSig",
       userAddress: request.userAddress,
       aaNonce: request.aaNonce,
       pointTokenAddress: this.pointTokenAddress,
       batchExecutorAddress: this.batchExecutorAddress,
-      burnRequest,
-      burnerSignature,
-      feeAmount: request.feeAmount,
+      burnRequest: sponsoredBurnRequest,
+      burnerSignature: sponsoredSig,
+      feeAmount: fee,
       feeRecipient: request.feeRecipient
     });
+    let fallback = void 0;
+    if (fee > 0n) {
+      const fallbackBurnRequest = {
+        from: request.userAddress,
+        amount: request.amount,
+        nonce: burnNonce,
+        deadline
+      };
+      let fallbackSig;
+      try {
+        fallbackSig = (await (0, import_core4.signBurnRequest)(this.burnerSignerWallet, domain, fallbackBurnRequest)).serialized;
+      } catch (err) {
+        throw new PTRedeemError(
+          "SIGNING_FAILED",
+          `failed to sign fallback BurnRequest: ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+      const fallbackLockId = await this.ledger.reservePendingCredit(
+        request.userAddress,
+        request.amount,
+        this.redeemLockDurationMs,
+        this.pointTokenAddress
+      );
+      const fallbackUserOp = this.relayService.prepareBurn({
+        mode: "burnWithSig",
+        userAddress: request.userAddress,
+        aaNonce: request.aaNonce,
+        pointTokenAddress: this.pointTokenAddress,
+        batchExecutorAddress: this.batchExecutorAddress,
+        burnRequest: fallbackBurnRequest,
+        burnerSignature: fallbackSig
+        // No feeAmount/feeRecipient — fallback is fee-free.
+      });
+      fallback = {
+        lockId: fallbackLockId,
+        userOp: fallbackUserOp,
+        netCreditAmount: request.amount
+      };
+    }
     return {
-      lockId,
-      userOp,
+      lockId: sponsoredLockId,
+      userOp: sponsoredUserOp,
+      netCreditAmount: sponsoredBurnAmount,
+      fallback,
       expiresInSeconds: Math.floor(this.redeemLockDurationMs / 1e3),
       signatureDeadline: deadline
     };