@pafi-dev/issuer 0.5.15 → 0.5.16

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,24 @@ 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 burnAmount = request.amount - fee;
+    const netCreditAmount = burnAmount;
     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(
@@ -1436,7 +1443,7 @@ var PTRedeemHandler = class {
     };
     const burnRequest = {
       from: request.userAddress,
-      amount: request.amount,
+      amount: burnAmount,
       nonce: burnNonce,
       deadline
     };
@@ -1456,7 +1463,7 @@ var PTRedeemHandler = class {
     }
     const lockId = await this.ledger.reservePendingCredit(
       request.userAddress,
-      request.amount,
+      netCreditAmount,
       this.redeemLockDurationMs,
       this.pointTokenAddress
     );
@@ -1468,12 +1475,13 @@ var PTRedeemHandler = class {
       batchExecutorAddress: this.batchExecutorAddress,
       burnRequest,
       burnerSignature,
-      feeAmount: request.feeAmount,
+      feeAmount: fee,
       feeRecipient: request.feeRecipient
     });
     return {
       lockId,
       userOp,
+      netCreditAmount,
       expiresInSeconds: Math.floor(this.redeemLockDurationMs / 1e3),
       signatureDeadline: deadline
     };