@pafi-dev/issuer 0.16.0 → 0.18.0

package/dist/index.cjs

@@ -30,6 +30,7 @@ __export(index_exports, {
   DEFAULT_REDEMPTION_POLICY: () => DEFAULT_REDEMPTION_POLICY,
   DefaultPolicyEngine: () => DefaultPolicyEngine,
   FeeManager: () => FeeManager,
+  GasUnitsCache: () => GasUnitsCache,
   InMemoryCursorStore: () => InMemoryCursorStore,
   IssuerApiAdapter: () => IssuerApiAdapter,
   IssuerApiHandlers: () => IssuerApiHandlers,
@@ -1093,22 +1094,172 @@ var RelayService = class {
       }
     });
   }
+  // =========================================================================
+  // Preview methods — produce bundler-ready partial UserOps WITHOUT signing.
+  //
+  // These exist so callers can compute an accurate gas estimate via
+  // `bundlerClient.estimateUserOperationGas(...)` BEFORE committing to a
+  // signed MintRequest / BurnRequest (signing is HSM-backed and expensive
+  // in prod). The returned `callData` matches the SHAPE of the real call;
+  // the EIP-712 signature bytes are placeholder. Bundler simulation
+  // doesn't validate the signature, so the gas units come back accurate.
+  //
+  // Cache-wise: same SC version + same scenario → same calldata shape →
+  // same bundler-returned gas units. The first call seeds the cache; the
+  // rest hit it.
+  // =========================================================================
+  /**
+   * Build a dummy `PartialUserOperation` for the mint scenario, suitable
+   * for `feeManager.estimateGasFee({ partialUserOp, ... })`. NO signing —
+   * uses a 65-byte zero signature in place of the real minter sig.
+   */
+  previewMintUserOp(params) {
+    const useWrapper = params.mintFeeWrapperAddress !== void 0;
+    let mintCallData;
+    let mintTarget;
+    if (useWrapper) {
+      mintCallData = (0, import_viem3.encodeFunctionData)({
+        abi: import_core5.mintFeeWrapperAbi,
+        functionName: "mintWithFee",
+        args: [
+          params.pointTokenAddress,
+          params.userAddress,
+          params.amount,
+          params.deadline,
+          PLACEHOLDER_SIG_65
+        ]
+      });
+      mintTarget = params.mintFeeWrapperAddress;
+    } else {
+      mintCallData = (0, import_viem3.encodeFunctionData)({
+        abi: import_core5.POINT_TOKEN_ABI,
+        functionName: "mint",
+        args: [
+          params.userAddress,
+          params.amount,
+          params.deadline,
+          PLACEHOLDER_SIG_65
+        ]
+      });
+      mintTarget = params.pointTokenAddress;
+    }
+    return (0, import_core5.buildPartialUserOperation)({
+      sender: params.userAddress,
+      nonce: params.aaNonce,
+      operations: [{ target: mintTarget, value: 0n, data: mintCallData }],
+      // Gas limits ignored by bundler estimate — it computes them.
+      gasLimits: { callGasLimit: 1n, verificationGasLimit: 1n, preVerificationGas: 1n }
+    });
+  }
+  /** Burn-side mirror of `previewMintUserOp`. */
+  previewBurnUserOp(params) {
+    const burnCallData = (0, import_viem3.encodeFunctionData)({
+      abi: import_core5.POINT_TOKEN_ABI,
+      functionName: "burn",
+      args: [
+        params.userAddress,
+        params.amount,
+        params.deadline,
+        PLACEHOLDER_SIG_65
+      ]
+    });
+    return (0, import_core5.buildPartialUserOperation)({
+      sender: params.userAddress,
+      nonce: params.aaNonce,
+      operations: [
+        { target: params.pointTokenAddress, value: 0n, data: burnCallData }
+      ],
+      gasLimits: { callGasLimit: 1n, verificationGasLimit: 1n, preVerificationGas: 1n }
+    });
+  }
 };
+var PLACEHOLDER_SIG_65 = `0x${"00".repeat(65)}`;
 function errorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
 
+// src/relay/gasUnitsCache.ts
+var import_viem4 = require("viem");
+var DEFAULT_TTL_MS = 5 * 6e4;
+var DEFAULT_CODEHASH_TTL_MS = 60 * 6e4;
+var DEFAULT_MAX_ENTRIES = 100;
+var GasUnitsCache = class {
+  entries = /* @__PURE__ */ new Map();
+  codehashEntries = /* @__PURE__ */ new Map();
+  ttlMs;
+  codehashTtlMs;
+  maxEntries;
+  constructor(config = {}) {
+    this.ttlMs = config.ttlMs ?? DEFAULT_TTL_MS;
+    this.codehashTtlMs = config.codehashTtlMs ?? DEFAULT_CODEHASH_TTL_MS;
+    this.maxEntries = config.maxEntries ?? DEFAULT_MAX_ENTRIES;
+  }
+  async buildKey(params) {
+    const codehash = await this.getCodehash(
+      params.provider,
+      params.contractAddress
+    );
+    const pm = params.paymasterAddress?.toLowerCase() ?? "0x0";
+    return `${params.scenario}:${codehash}:${pm}`;
+  }
+  get(key, now = Date.now()) {
+    const entry = this.entries.get(key);
+    if (!entry) return null;
+    if (entry.expiresAt <= now) {
+      this.entries.delete(key);
+      return null;
+    }
+    return entry.gasUnits;
+  }
+  set(key, gasUnits, now = Date.now()) {
+    if (this.entries.size >= this.maxEntries && !this.entries.has(key)) {
+      const eldest = this.entries.keys().next().value;
+      if (eldest !== void 0) this.entries.delete(eldest);
+    }
+    this.entries.set(key, { gasUnits, expiresAt: now + this.ttlMs });
+  }
+  invalidate() {
+    this.entries.clear();
+    this.codehashEntries.clear();
+  }
+  size() {
+    return this.entries.size;
+  }
+  async getCodehash(provider, address) {
+    const lower = address.toLowerCase();
+    const now = Date.now();
+    const cached = this.codehashEntries.get(lower);
+    if (cached && cached.expiresAt > now) return cached.codehash;
+    const code = await provider.getCode({ address });
+    const codehash = code ? (0, import_viem4.keccak256)(code) : "0x0";
+    this.codehashEntries.set(lower, {
+      codehash,
+      expiresAt: now + this.codehashTtlMs
+    });
+    return codehash;
+  }
+};
+
 // src/relay/feeManager.ts
 var DEFAULT_GAS_UNITS = 500000n;
-var DEFAULT_PREMIUM_BPS = 12e3;
+var DEFAULT_PREMIUM_BPS = 1e4;
+var DEFAULT_PAYMASTER_OVERHEAD = 80000n;
+var DUMMY_SIGNATURE = "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
 var FeeManager = class _FeeManager {
   provider;
   gasUnits;
   gasPremiumBps;
   quoteNativeToFee;
+  bundlerClient;
+  cache;
+  paymasterOverheadGas;
+  metrics;
+  // Short-lived in-flight fee cache (legacy behavior). Distinct from
+  // `cache` — that one stores gasUnits per scenario; this one stores the
+  // FULL computed fee value, valid for 10s to absorb burst calls.
   cachedFee = null;
   cacheExpiresAt = 0;
-  static CACHE_TTL_MS = 1e4;
+  static FEE_CACHE_TTL_MS = 1e4;
   constructor(config) {
     if (!config.provider) throw new Error("FeeManager: provider required");
     if (!config.quoteNativeToFee)
@@ -1117,32 +1268,101 @@ var FeeManager = class _FeeManager {
     this.gasUnits = config.gasUnits ?? DEFAULT_GAS_UNITS;
     this.gasPremiumBps = config.gasPremiumBps ?? DEFAULT_PREMIUM_BPS;
     this.quoteNativeToFee = config.quoteNativeToFee;
+    this.bundlerClient = config.bundlerClient;
+    this.cache = new GasUnitsCache(config.cache);
+    this.paymasterOverheadGas = config.paymasterOverheadGas ?? DEFAULT_PAYMASTER_OVERHEAD;
+    this.metrics = config.metrics;
   }
   /**
    * Estimate the fee (in the caller's fee currency) to charge for the
-   * next sponsored UserOp:
+   * next sponsored UserOp.
    *
+   *   gasUnits      = bundler-estimated (cached) or hardcoded fallback
    *   nativeCost    = gasUnits × gasPrice
    *   withPremium   = nativeCost × premiumBps / 10_000
    *   fee           = quoteNativeToFee(withPremium)
    *
-   * For backward compatibility with v0.2.x code that reads `gasFeeUsdt`
-   * from the response, the name `estimateGasFee` is kept — but the
-   * currency depends on how the caller wired `quoteNativeToFee`.
+   * When `opts.partialUserOp` is omitted, behaves exactly like v0.16.x:
+   * uses the hardcoded `gasUnits` default.
    */
-  async estimateGasFee() {
+  async estimateGasFee(opts = {}) {
     const now = Date.now();
-    if (this.cachedFee !== null && now < this.cacheExpiresAt) {
+    const isLegacyCall = !opts.partialUserOp && !opts.scenario && !opts.contractAddress;
+    if (isLegacyCall && this.cachedFee !== null && now < this.cacheExpiresAt) {
       return this.cachedFee;
     }
+    const t0 = Date.now();
+    const { gasUnits, source } = await this.resolveGasUnits(opts);
+    const latencyMs = Date.now() - t0;
+    this.safeEmit(
+      () => this.metrics?.onEstimate?.({
+        source,
+        scenario: opts.scenario,
+        gasUnits,
+        latencyMs
+      })
+    );
     const gasPrice = await this.provider.getGasPrice();
-    const nativeCost = gasPrice * this.gasUnits;
+    const nativeCost = gasPrice * gasUnits;
     const withPremium = nativeCost * BigInt(this.gasPremiumBps) / 10000n;
     const fee = await this.quoteNativeToFee(withPremium);
-    this.cachedFee = fee;
-    this.cacheExpiresAt = now + _FeeManager.CACHE_TTL_MS;
+    if (isLegacyCall) {
+      this.cachedFee = fee;
+      this.cacheExpiresAt = now + _FeeManager.FEE_CACHE_TTL_MS;
+    }
     return fee;
   }
+  /**
+   * Manually purge the per-scenario gas-units cache. Useful after an SC
+   * upgrade when ops wants the next estimate to refresh immediately
+   * (the codehash check would catch it on the NEXT call anyway, but
+   * this forces it now).
+   */
+  invalidateCache() {
+    this.cache.invalidate();
+    this.cachedFee = null;
+    this.cacheExpiresAt = 0;
+  }
+  async resolveGasUnits(opts) {
+    if (!this.bundlerClient || !opts.partialUserOp || !opts.scenario || !opts.contractAddress) {
+      return { gasUnits: this.gasUnits, source: "fallback" };
+    }
+    try {
+      const cacheKey = await this.cache.buildKey({
+        scenario: opts.scenario,
+        contractAddress: opts.contractAddress,
+        paymasterAddress: opts.paymasterAddress,
+        provider: this.provider
+      });
+      const cached = this.cache.get(cacheKey);
+      if (cached !== null) {
+        return { gasUnits: cached, source: "cache" };
+      }
+      const estimate = await this.bundlerClient.estimateUserOperationGas({
+        sender: opts.partialUserOp.sender,
+        nonce: opts.partialUserOp.nonce,
+        callData: opts.partialUserOp.callData,
+        signature: opts.partialUserOp.signature ?? DUMMY_SIGNATURE
+        // Intentionally NO paymaster fields — avoids chicken-and-egg
+        // (paymasterData depends on gasLimits). Overhead added below.
+      });
+      const gasUnits = estimate.callGasLimit + estimate.verificationGasLimit + estimate.preVerificationGas + (estimate.paymasterVerificationGasLimit ?? 0n) + (estimate.paymasterPostOpGasLimit ?? 0n) + this.paymasterOverheadGas;
+      this.cache.set(cacheKey, gasUnits);
+      return { gasUnits, source: "bundler" };
+    } catch (err) {
+      const reason = err instanceof Error ? err.message : String(err);
+      this.safeEmit(
+        () => this.metrics?.onBundlerError?.({ scenario: opts.scenario, reason })
+      );
+      return { gasUnits: this.gasUnits, source: "fallback" };
+    }
+  }
+  safeEmit(fn) {
+    try {
+      fn();
+    } catch {
+    }
+  }
 };
 
 // src/indexer/types.ts
@@ -1157,11 +1377,11 @@ var InMemoryCursorStore = class {
 };
 
 // src/indexer/pointIndexer.ts
-var import_viem4 = require("viem");
-var TRANSFER_EVENT = (0, import_viem4.parseAbiItem)(
+var import_viem5 = require("viem");
+var TRANSFER_EVENT = (0, import_viem5.parseAbiItem)(
   "event Transfer(address indexed from, address indexed to, uint256 value)"
 );
-var MINT_WITH_FEE_EVENT = (0, import_viem4.parseAbiItem)(
+var MINT_WITH_FEE_EVENT = (0, import_viem5.parseAbiItem)(
   "event MintWithFee(address indexed pointToken, address indexed to, uint256 grossAmount, uint256 netAmount, uint256 feeAmount)"
 );
 var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
@@ -1171,7 +1391,7 @@ var DEFAULT_BATCH_SIZE = 2000n;
 var DEFAULT_POLL_INTERVAL_MS = 5e3;
 function isNoWrapper(addr) {
   if (!addr) return true;
-  const checksummed = (0, import_viem4.getAddress)(addr);
+  const checksummed = (0, import_viem5.getAddress)(addr);
   return checksummed === ZERO_ADDRESS || checksummed === DEAD_ADDRESS;
 }
 var PointIndexer = class {
@@ -1193,8 +1413,8 @@ var PointIndexer = class {
       throw new Error("PointIndexer: pointTokenAddress required");
     if (!config.ledger) throw new Error("PointIndexer: ledger required");
     this.provider = config.provider;
-    this.pointTokenAddress = (0, import_viem4.getAddress)(config.pointTokenAddress);
-    this.mintFeeWrapperAddress = isNoWrapper(config.mintFeeWrapperAddress) ? void 0 : (0, import_viem4.getAddress)(config.mintFeeWrapperAddress);
+    this.pointTokenAddress = (0, import_viem5.getAddress)(config.pointTokenAddress);
+    this.mintFeeWrapperAddress = isNoWrapper(config.mintFeeWrapperAddress) ? void 0 : (0, import_viem5.getAddress)(config.mintFeeWrapperAddress);
     this.ledger = config.ledger;
     this.cursorStore = config.cursorStore ?? new InMemoryCursorStore();
     this.startBlock = config.fromBlock ?? 0n;
@@ -1313,9 +1533,9 @@ var PointIndexer = class {
       if (!args.pointToken || !args.to || args.grossAmount === void 0 || log.blockNumber === null || log.transactionHash === null) {
         continue;
       }
-      if ((0, import_viem4.getAddress)(args.pointToken) !== this.pointTokenAddress) continue;
+      if ((0, import_viem5.getAddress)(args.pointToken) !== this.pointTokenAddress) continue;
       out.push({
-        to: (0, import_viem4.getAddress)(args.to),
+        to: (0, import_viem5.getAddress)(args.to),
         amount: args.grossAmount,
         blockNumber: log.blockNumber,
         txHash: log.transactionHash,
@@ -1343,10 +1563,10 @@ var PointIndexer = class {
     for (const log of logs) {
       const args = log.args;
       if (!args.from || !args.to || args.value === void 0) continue;
-      if ((0, import_viem4.getAddress)(args.from) !== ZERO_ADDRESS) continue;
+      if ((0, import_viem5.getAddress)(args.from) !== ZERO_ADDRESS) continue;
       if (log.blockNumber === null || log.transactionHash === null) continue;
       out.push({
-        to: (0, import_viem4.getAddress)(args.to),
+        to: (0, import_viem5.getAddress)(args.to),
         amount: args.value,
         blockNumber: log.blockNumber,
         txHash: log.transactionHash,
@@ -1405,8 +1625,8 @@ function pickMatchingLock(locks, amount) {
 }
 
 // src/indexer/burnIndexer.ts
-var import_viem5 = require("viem");
-var TRANSFER_EVENT2 = (0, import_viem5.parseAbiItem)(
+var import_viem6 = require("viem");
+var TRANSFER_EVENT2 = (0, import_viem6.parseAbiItem)(
   "event Transfer(address indexed from, address indexed to, uint256 value)"
 );
 var ZERO_ADDRESS2 = "0x0000000000000000000000000000000000000000";
@@ -1537,10 +1757,10 @@ var BurnIndexer = class {
     for (const log of logs) {
       const args = log.args;
       if (!args.from || !args.to || args.value === void 0) continue;
-      if ((0, import_viem5.getAddress)(args.to) !== ZERO_ADDRESS2) continue;
+      if ((0, import_viem6.getAddress)(args.to) !== ZERO_ADDRESS2) continue;
       if (log.blockNumber === null || log.transactionHash === null) continue;
       out.push({
-        from: (0, import_viem5.getAddress)(args.from),
+        from: (0, import_viem6.getAddress)(args.from),
         amount: args.value,
         blockNumber: log.blockNumber,
         txHash: log.transactionHash,
@@ -1575,7 +1795,7 @@ var BurnIndexer = class {
 };
 
 // src/api/handlers.ts
-var import_viem6 = require("viem");
+var import_viem7 = require("viem");
 var import_core6 = require("@pafi-dev/core");
 var IssuerApiHandlers = class _IssuerApiHandlers {
   authService;
@@ -1612,7 +1832,7 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
         "IssuerApiHandlers: pointTokenAddress or pointTokenAddresses required"
       );
     }
-    const normalized = raw.map((a) => (0, import_viem6.getAddress)(a));
+    const normalized = raw.map((a) => (0, import_viem7.getAddress)(a));
     this.supportedTokens = new Set(normalized);
     this.chainId = config.chainId;
     this.contracts = config.contracts;
@@ -1621,7 +1841,7 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
     if (config.poolsProvider) this.poolsProvider = config.poolsProvider;
     if (config.redemption) this.redemption = config.redemption;
     if (config.mintFeeWrapperAddress) {
-      this.mintFeeWrapperAddress = (0, import_viem6.getAddress)(config.mintFeeWrapperAddress);
+      this.mintFeeWrapperAddress = (0, import_viem7.getAddress)(config.mintFeeWrapperAddress);
     }
   }
   // =========================================================================
@@ -1828,8 +2048,8 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
         { requested: request.chainId, supported: this.chainId }
       );
     }
-    const normalizedAuthed = (0, import_viem6.getAddress)(userAddress);
-    const normalizedRequest = (0, import_viem6.getAddress)(request.userAddress);
+    const normalizedAuthed = (0, import_viem7.getAddress)(userAddress);
+    const normalizedRequest = (0, import_viem7.getAddress)(request.userAddress);
     if (normalizedAuthed !== normalizedRequest) {
       throw new import_core3.ValidationError(
         "USER_ADDRESS_MISMATCH",
@@ -1837,7 +2057,7 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
         { authenticated: normalizedAuthed, requested: normalizedRequest }
       );
     }
-    const pointToken = (0, import_viem6.getAddress)(request.pointTokenAddress);
+    const pointToken = (0, import_viem7.getAddress)(request.pointTokenAddress);
     if (!this.supportedTokens.has(pointToken)) {
       throw new import_core3.ValidationError(
         "UNSUPPORTED_POINT_TOKEN",
@@ -1878,9 +2098,9 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
         "handleRedemptionPreview: redemption is not configured on this issuer"
       );
     }
-    const tokenAddress = request.pointTokenAddress ? this.requireSupportedToken((0, import_viem6.getAddress)(request.pointTokenAddress), "handleRedemptionPreview") : void 0;
+    const tokenAddress = request.pointTokenAddress ? this.requireSupportedToken((0, import_viem7.getAddress)(request.pointTokenAddress), "handleRedemptionPreview") : void 0;
     const preview = await this.redemption.preview(
-      (0, import_viem6.getAddress)(userAddress),
+      (0, import_viem7.getAddress)(userAddress),
       tokenAddress
     );
     return preview;
@@ -1909,9 +2129,9 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
         { amountPt: request.amountPt.toString() }
       );
     }
-    const tokenAddress = request.pointTokenAddress ? this.requireSupportedToken((0, import_viem6.getAddress)(request.pointTokenAddress), "handleRedemptionEvaluate") : void 0;
+    const tokenAddress = request.pointTokenAddress ? this.requireSupportedToken((0, import_viem7.getAddress)(request.pointTokenAddress), "handleRedemptionEvaluate") : void 0;
     const decision = await this.redemption.evaluate(
-      (0, import_viem6.getAddress)(userAddress),
+      (0, import_viem7.getAddress)(userAddress),
       request.amountPt,
       tokenAddress
     );
@@ -1935,7 +2155,7 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
 };
 
 // src/api/handlers/ptRedeemHandler.ts
-var import_viem7 = require("viem");
+var import_viem8 = require("viem");
 var import_core7 = require("@pafi-dev/core");
 var DEFAULT_REDEEM_LOCK_MS = 15 * 60 * 1e3;
 var DEFAULT_SIG_DEADLINE_SEC = 15 * 60;
@@ -1996,8 +2216,8 @@ var PTRedeemHandler = class {
     this.relayService = config.relayService;
     this.provider = config.provider;
     this.feeService = config.feeService;
-    this.pointTokenAddress = (0, import_viem7.getAddress)(config.pointTokenAddress);
-    this.batchExecutorAddress = (0, import_viem7.getAddress)(config.batchExecutorAddress);
+    this.pointTokenAddress = (0, import_viem8.getAddress)(config.pointTokenAddress);
+    this.batchExecutorAddress = (0, import_viem8.getAddress)(config.batchExecutorAddress);
     this.chainId = config.chainId;
     this.domain = config.domain;
     this.burnerSignerWallet = config.burnerSignerWallet;
@@ -2012,7 +2232,7 @@ var PTRedeemHandler = class {
     }
   }
   async handle(request) {
-    if ((0, import_viem7.getAddress)(request.authenticatedAddress) !== (0, import_viem7.getAddress)(request.userAddress)) {
+    if ((0, import_viem8.getAddress)(request.authenticatedAddress) !== (0, import_viem8.getAddress)(request.userAddress)) {
       throw new PTRedeemError(
         "UNAUTHORIZED",
         `userAddress (${request.userAddress}) does not match authenticated session (${request.authenticatedAddress})`
@@ -2050,7 +2270,7 @@ var PTRedeemHandler = class {
         `failed to read burnRequestNonces(${request.userAddress}): ${err instanceof Error ? err.message : String(err)}`
       );
     }
-    const userKey = (0, import_viem7.getAddress)(request.userAddress).toLowerCase();
+    const userKey = (0, import_viem8.getAddress)(request.userAddress).toLowerCase();
     let userNonces = this.inFlightNonces.get(userKey);
     if (!userNonces) {
       userNonces = /* @__PURE__ */ new Set();
@@ -2071,11 +2291,29 @@ var PTRedeemHandler = class {
     }
   }
   async _handleAfterNonceLock(request, burnNonce) {
+    const previewDeadline = BigInt(
+      Math.floor(this.now() / 1e3) + this.signatureDeadlineSeconds
+    );
     let fee;
     if (request.feeAmount !== void 0) {
       fee = request.feeAmount > 0n ? request.feeAmount : 0n;
     } else if (this.feeService) {
-      fee = await this.feeService.estimateGasFee();
+      const previewUserOp = this.relayService.previewBurnUserOp({
+        userAddress: request.userAddress,
+        aaNonce: burnNonce,
+        pointTokenAddress: this.pointTokenAddress,
+        amount: request.amount,
+        deadline: previewDeadline
+      });
+      fee = await this.feeService.estimateGasFee({
+        scenario: "burn",
+        contractAddress: this.pointTokenAddress,
+        partialUserOp: {
+          sender: previewUserOp.sender,
+          nonce: previewUserOp.nonce,
+          callData: previewUserOp.callData
+        }
+      });
     } else {
       fee = 0n;
     }
@@ -2097,9 +2335,7 @@ var PTRedeemHandler = class {
         `insufficient on-chain PT balance: have ${onChainBalance}, need ${request.amount}`
       );
     }
-    const deadline = BigInt(
-      Math.floor(this.now() / 1e3) + this.signatureDeadlineSeconds
-    );
+    const deadline = previewDeadline;
     const domain = {
       name: this.domain.name,
       chainId: this.chainId,
@@ -2316,7 +2552,7 @@ async function handleRedeemStatus(params) {
 }
 
 // src/api/mobileHandlers.ts
-var import_viem8 = require("viem");
+var import_viem9 = require("viem");
 var import_core10 = require("@pafi-dev/core");
 
 // src/userop-store/serialize.ts
@@ -2662,7 +2898,7 @@ async function handleMobileSubmit(params) {
   if (!entry) {
     throw new PendingUserOpNotFoundError(params.lockId);
   }
-  if ((0, import_viem8.getAddress)(entry.sender) !== (0, import_viem8.getAddress)(params.authenticatedAddress)) {
+  if ((0, import_viem9.getAddress)(entry.sender) !== (0, import_viem9.getAddress)(params.authenticatedAddress)) {
     throw new PendingUserOpForbiddenError(params.lockId);
   }
   const variant = params.variant ?? "sponsored";
@@ -2678,7 +2914,7 @@ async function handleMobileSubmit(params) {
 }
 
 // src/api/handlers/ptClaimHandler.ts
-var import_viem9 = require("viem");
+var import_viem10 = require("viem");
 var import_core11 = require("@pafi-dev/core");
 
 // src/issuer-state/types.ts
@@ -2724,7 +2960,7 @@ var PTClaimHandler = class {
     };
   }
   async handle(request) {
-    if ((0, import_viem9.getAddress)(request.authenticatedAddress) !== (0, import_viem9.getAddress)(request.userAddress)) {
+    if ((0, import_viem10.getAddress)(request.authenticatedAddress) !== (0, import_viem10.getAddress)(request.userAddress)) {
       throw new PTClaimError(
         "VALIDATION_FAILED",
         `userAddress (${request.userAddress}) does not match authenticated session (${request.authenticatedAddress})`
@@ -2762,7 +2998,23 @@ var PTClaimHandler = class {
       const signatureDeadline = BigInt(
         Math.floor(this.cfg.now() / 1e3) + this.cfg.signatureDeadlineSeconds
       );
-      const feeAmount = this.cfg.feeService ? await this.cfg.feeService.estimateGasFee() : 0n;
+      const previewUserOp = this.cfg.relayService.previewMintUserOp({
+        userAddress: request.userAddress,
+        aaNonce: request.aaNonce,
+        pointTokenAddress: request.pointTokenAddress,
+        amount: request.amount,
+        deadline: signatureDeadline,
+        mintFeeWrapperAddress: resolvedWrapper
+      });
+      const feeAmount = this.cfg.feeService ? await this.cfg.feeService.estimateGasFee({
+        scenario: resolvedWrapper ? "mint-wrapped" : "mint",
+        contractAddress: request.pointTokenAddress,
+        partialUserOp: {
+          sender: previewUserOp.sender,
+          nonce: previewUserOp.nonce,
+          callData: previewUserOp.callData
+        }
+      }) : 0n;
       const domain = {
         name: this.cfg.pointTokenDomainName,
         chainId: request.chainId,
@@ -2962,7 +3214,7 @@ var PerpDepositHandler = class {
 
 // src/api/delegateHandler.ts
 var import_core13 = require("@pafi-dev/core");
-var import_viem10 = require("viem");
+var import_viem11 = require("viem");
 var DEFAULT_DELEGATE_GAS = {
   callGasLimit: 100000n,
   verificationGasLimit: 150000n,
@@ -3049,7 +3301,7 @@ async function handleDelegateSubmit(params) {
   if (!entry) {
     throw new PendingUserOpNotFoundError(params.lockId);
   }
-  if ((0, import_viem10.getAddress)(entry.sender) !== (0, import_viem10.getAddress)(params.authenticatedAddress)) {
+  if ((0, import_viem11.getAddress)(entry.sender) !== (0, import_viem11.getAddress)(params.authenticatedAddress)) {
     throw new PendingUserOpForbiddenError(params.lockId);
   }
   if (!entry.eip7702Auth) {
@@ -3070,7 +3322,7 @@ async function handleDelegateSubmit(params) {
 
 // src/api/issuerApiAdapter.ts
 var import_node_crypto3 = require("crypto");
-var import_viem11 = require("viem");
+var import_viem12 = require("viem");
 var import_core14 = require("@pafi-dev/core");
 var AdapterMisconfiguredError = class extends Error {
   code = "ADAPTER_MISCONFIGURED";
@@ -3128,7 +3380,7 @@ var IssuerApiAdapter = class {
   async pools(authenticatedAddress, chainId, pointTokenAddress) {
     const result = await this.cfg.issuerService.api.handlePools(
       authenticatedAddress,
-      { chainId, pointTokenAddress: (0, import_viem11.getAddress)(pointTokenAddress) }
+      { chainId, pointTokenAddress: (0, import_viem12.getAddress)(pointTokenAddress) }
     );
     return { pools: result.pools };
   }
@@ -3137,8 +3389,8 @@ var IssuerApiAdapter = class {
       authenticatedAddress,
       {
         chainId,
-        userAddress: (0, import_viem11.getAddress)(userAddress),
-        pointTokenAddress: (0, import_viem11.getAddress)(pointTokenAddress)
+        userAddress: (0, import_viem12.getAddress)(userAddress),
+        pointTokenAddress: (0, import_viem12.getAddress)(pointTokenAddress)
       }
     );
     return {
@@ -3159,7 +3411,7 @@ var IssuerApiAdapter = class {
       "ptClaimHandler",
       "claim"
     );
-    const pointTokenAddress = (0, import_viem11.getAddress)(input.pointTokenAddress);
+    const pointTokenAddress = (0, import_viem12.getAddress)(input.pointTokenAddress);
     const result = await ptClaimHandler.handle({
       authenticatedAddress: input.authenticatedAddress,
       userAddress: input.authenticatedAddress,
@@ -3254,7 +3506,7 @@ var IssuerApiAdapter = class {
       "ptClaimHandler",
       "claimPrepare"
     );
-    const pointTokenAddress = (0, import_viem11.getAddress)(input.pointTokenAddress);
+    const pointTokenAddress = (0, import_viem12.getAddress)(input.pointTokenAddress);
     const claimResult = await ptClaimHandler.handle({
       authenticatedAddress: input.authenticatedAddress,
       userAddress: input.authenticatedAddress,
@@ -3300,7 +3552,7 @@ var IssuerApiAdapter = class {
   }
   async redeemPrepare(input) {
     this.assertRedeemHandler();
-    const pointTokenAddress = (0, import_viem11.getAddress)(input.pointTokenAddress);
+    const pointTokenAddress = (0, import_viem12.getAddress)(input.pointTokenAddress);
     const redeemResponse = await this.cfg.ptRedeemHandler.handle({
       userAddress: input.authenticatedAddress,
       authenticatedAddress: input.authenticatedAddress,
@@ -3490,7 +3742,7 @@ var IssuerApiAdapter = class {
 };
 
 // src/pools/subgraphPoolsProvider.ts
-var import_viem12 = require("viem");
+var import_viem13 = require("viem");
 var import_core15 = require("@pafi-dev/core");
 var DEFAULT_CACHE_TTL_MS = 3e4;
 var MAX_REASONABLE_FEE_TIER = 1e6;
@@ -3613,7 +3865,7 @@ async function fetchPoolsFromSubgraph(fetchImpl, subgraphUrl, pointTokenAddress,
     return [];
   }
   const { pool } = token;
-  if (!(0, import_viem12.isAddress)(pool.token0.id) || !(0, import_viem12.isAddress)(pool.token1.id)) {
+  if (!(0, import_viem13.isAddress)(pool.token0.id) || !(0, import_viem13.isAddress)(pool.token1.id)) {
     const error = new Error(
       "[PAFI] SubgraphPoolsProvider: invalid token address in response"
     );
@@ -3766,8 +4018,8 @@ function toUsdtPerNative(priceFloat, usdtDecimals) {
 }
 
 // src/pools/nativePtQuoter.ts
-var import_viem13 = require("viem");
-var CHAINLINK_ABI = (0, import_viem13.parseAbi)([
+var import_viem14 = require("viem");
+var CHAINLINK_ABI = (0, import_viem14.parseAbi)([
   "function latestRoundData() external view returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound)"
 ]);
 var CHAINLINK_MAX_AGE_S = 3600n;
@@ -4051,7 +4303,7 @@ var PafiBackendClient = class {
 };
 
 // src/config.ts
-var import_viem14 = require("viem");
+var import_viem15 = require("viem");
 var import_core18 = require("@pafi-dev/core");
 
 // src/redemption/evaluator.ts
@@ -4378,7 +4630,7 @@ function createIssuerService(config) {
       "createIssuerService: at least one of pointTokenAddress / pointTokenAddresses is required"
     );
   }
-  const tokenAddresses = rawAddresses.map((a) => (0, import_viem14.getAddress)(a));
+  const tokenAddresses = rawAddresses.map((a) => (0, import_viem15.getAddress)(a));
   const ledger = config.ledger;
   const sessionStore = config.sessionStore ?? new MemorySessionStore();
   const policy = config.policy ?? new DefaultPolicyEngine({ ledger });
@@ -4497,7 +4749,7 @@ function createIssuerService(config) {
 }
 
 // src/issuer-state/validator.ts
-var import_viem15 = require("viem");
+var import_viem16 = require("viem");
 var import_core19 = require("@pafi-dev/core");
 var ISSUER_RECORD_TTL_MS = 3e4;
 var IssuerStateValidator = class _IssuerStateValidator {
@@ -4524,7 +4776,7 @@ var IssuerStateValidator = class _IssuerStateValidator {
    */
   invalidate(pointToken) {
     if (pointToken) {
-      const key = (0, import_viem15.getAddress)(pointToken);
+      const key = (0, import_viem16.getAddress)(pointToken);
       this.pointTokenIssuerCache.delete(key);
       this.stateCache.delete(key);
       this.inflight.delete(key);
@@ -4539,7 +4791,7 @@ var IssuerStateValidator = class _IssuerStateValidator {
    * The issuer field is set at `initialize()` and never changes.
    */
   async getIssuerAddressForPointToken(pointToken) {
-    const key = (0, import_viem15.getAddress)(pointToken);
+    const key = (0, import_viem16.getAddress)(pointToken);
     const cached = this.pointTokenIssuerCache.get(key);
     if (cached) return cached;
     const issuer = await this.provider.readContract({
@@ -4547,15 +4799,15 @@ var IssuerStateValidator = class _IssuerStateValidator {
       abi: import_core19.POINT_TOKEN_ABI,
       functionName: "issuer"
     });
-    this.pointTokenIssuerCache.set(key, (0, import_viem15.getAddress)(issuer));
-    return (0, import_viem15.getAddress)(issuer);
+    this.pointTokenIssuerCache.set(key, (0, import_viem16.getAddress)(issuer));
+    return (0, import_viem16.getAddress)(issuer);
   }
   /**
    * Read registry record + totalSupply, with 30s cache and in-flight
    * deduplication. Does NOT throw on inactive/missing — returns raw state.
    */
   async getIssuerState(pointToken) {
-    const tokenAddr = (0, import_viem15.getAddress)(pointToken);
+    const tokenAddr = (0, import_viem16.getAddress)(pointToken);
     const now = Date.now();
     const cached = this.stateCache.get(tokenAddr);
     if (cached && cached.expiresAt > now) return cached.value;
@@ -4698,7 +4950,7 @@ var MemoryRedemptionHistoryStore = class {
 };
 
 // src/index.ts
-var PAFI_ISSUER_SDK_VERSION = true ? "0.16.0" : "dev";
+var PAFI_ISSUER_SDK_VERSION = true ? "0.18.0" : "dev";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AdapterMisconfiguredError,
@@ -4711,6 +4963,7 @@ var PAFI_ISSUER_SDK_VERSION = true ? "0.16.0" : "dev";
   DEFAULT_REDEMPTION_POLICY,
   DefaultPolicyEngine,
   FeeManager,
+  GasUnitsCache,
   InMemoryCursorStore,
   IssuerApiAdapter,
   IssuerApiHandlers,