@pafi-dev/issuer 0.19.0 → 0.21.0

package/dist/index.js

@@ -862,58 +862,265 @@ var RelayService = class {
       }
     });
   }
+  // =========================================================================
+  // Preview methods — produce bundler-ready partial UserOps WITHOUT signing.
+  //
+  // These exist so callers can fetch an accurate gas estimate from PAFI's
+  // `/v1/estimate-gas-fee` BEFORE committing to a signed MintRequest /
+  // BurnRequest (HSM/KMS signing is expensive in production). The
+  // returned `callData` matches the SHAPE of the real call; the EIP-712
+  // signature bytes are a placeholder. Bundler simulation doesn't
+  // validate the signature, so the gas estimate comes back accurate.
+  //
+  // Cache-wise: same SC version + same scenario produce identical
+  // calldata shape → identical bundler-returned gas units. The first
+  // call seeds the cache; subsequent ones hit it.
+  // =========================================================================
+  /**
+   * Build a dummy `PartialUserOperation` for the mint scenario, suitable
+   * for `feeManager.estimateGasFee({ partialUserOp, ... })`. NO signing —
+   * uses a 65-byte zero signature placeholder.
+   */
+  previewMintUserOp(params) {
+    const useWrapper = params.mintFeeWrapperAddress !== void 0;
+    let mintCallData;
+    let mintTarget;
+    if (useWrapper) {
+      mintCallData = encodeFunctionData({
+        abi: mintFeeWrapperAbi,
+        functionName: "mintWithFee",
+        args: [
+          params.pointTokenAddress,
+          params.userAddress,
+          params.amount,
+          params.deadline,
+          PLACEHOLDER_SIG_65
+        ]
+      });
+      mintTarget = params.mintFeeWrapperAddress;
+    } else {
+      mintCallData = encodeFunctionData({
+        abi: POINT_TOKEN_ABI,
+        functionName: "mint",
+        args: [
+          params.userAddress,
+          params.amount,
+          params.deadline,
+          PLACEHOLDER_SIG_65
+        ]
+      });
+      mintTarget = params.pointTokenAddress;
+    }
+    return 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 = encodeFunctionData({
+      abi: POINT_TOKEN_ABI,
+      functionName: "burn",
+      args: [
+        params.userAddress,
+        params.amount,
+        params.deadline,
+        PLACEHOLDER_SIG_65
+      ]
+    });
+    return 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/feeManager.ts
 var DEFAULT_GAS_UNITS = 500000n;
-var DEFAULT_PREMIUM_BPS = 12e3;
+var DEFAULT_PREMIUM_BPS = 1e4;
 var FeeManager = class _FeeManager {
   provider;
-  gasUnits;
+  fallbackGasUnits;
   gasPremiumBps;
   quoteNativeToFee;
+  bundlerClient;
+  metrics;
+  // Short-lived fee-value cache. Distinct from the estimator's cache:
+  // this absorbs burst calls (e.g. 5 user requests in 5s all hit the
+  // /gas-fee endpoint) by remembering the COMPUTED PT amount, not the
+  // gas units. Only used by the no-opts legacy path; estimator path
+  // gets its caching from the PAFI side instead.
   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)
       throw new Error("FeeManager: quoteNativeToFee required");
     this.provider = config.provider;
-    this.gasUnits = config.gasUnits ?? DEFAULT_GAS_UNITS;
+    this.fallbackGasUnits = config.gasUnits ?? DEFAULT_GAS_UNITS;
     this.gasPremiumBps = config.gasPremiumBps ?? DEFAULT_PREMIUM_BPS;
     this.quoteNativeToFee = config.quoteNativeToFee;
+    this.bundlerClient = config.bundlerClient;
+    this.metrics = config.metrics;
   }
   /**
-   * Estimate the fee (in the caller's fee currency) to charge for the
-   * next sponsored UserOp:
+   * Estimate the operator fee for the next sponsored UserOp.
    *
-   *   nativeCost    = gasUnits × gasPrice
-   *   withPremium   = nativeCost × premiumBps / 10_000
-   *   fee           = quoteNativeToFee(withPremium)
+   * Without `opts` → legacy path: `gasUnits × gasPrice × premium →
+   * quoteNativeToFee`. Cached for 10 s to absorb bursts.
    *
-   * 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`.
+   * With `opts` AND `bundlerClient` → estimator path. Each call may
+   * hit a different bundler-cached result; the SDK does NOT add its
+   * own value cache because the estimator's cache TTL is the source
+   * of truth for "how long is this estimate good for".
    */
-  async estimateGasFee() {
+  async estimateGasFee(opts = {}) {
+    const isLegacyCall = !opts.partialUserOp && !opts.scenario && !opts.contractAddress;
     const now = Date.now();
-    if (this.cachedFee !== null && now < this.cacheExpiresAt) {
+    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 legacy 10s fee cache. */
+  invalidateCache() {
+    this.cachedFee = null;
+    this.cacheExpiresAt = 0;
+  }
+  async resolveGasUnits(opts) {
+    if (!this.bundlerClient || !opts.partialUserOp || !opts.scenario || !opts.contractAddress) {
+      return { gasUnits: this.fallbackGasUnits, source: "fallback" };
+    }
+    try {
+      const result = await this.bundlerClient.getGasUnits({
+        scenario: opts.scenario,
+        contractAddress: opts.contractAddress,
+        paymasterAddress: opts.paymasterAddress,
+        partialUserOp: opts.partialUserOp
+      });
+      return { gasUnits: result.gasUnits, source: "estimator" };
+    } catch (err) {
+      const reason = err instanceof Error ? err.message : String(err);
+      this.safeEmit(
+        () => this.metrics?.onEstimatorError?.({
+          scenario: opts.scenario,
+          reason
+        })
+      );
+      return { gasUnits: this.fallbackGasUnits, source: "fallback" };
+    }
+  }
+  safeEmit(fn) {
+    try {
+      fn();
+    } catch {
+    }
+  }
 };
 
+// src/relay/bundlerEstimator.ts
+var PafiEstimatorHttpError = class extends Error {
+  status;
+  body;
+  constructor(status, body, message) {
+    super(message ?? `PAFI estimator HTTP ${status}`);
+    this.status = status;
+    this.body = body;
+  }
+};
+function createPafiEstimatorClient(config) {
+  const { baseUrl, apiKey, issuerId } = config;
+  if (!baseUrl) throw new Error("createPafiEstimatorClient: baseUrl required");
+  if (!apiKey) throw new Error("createPafiEstimatorClient: apiKey required");
+  if (!issuerId) throw new Error("createPafiEstimatorClient: issuerId required");
+  const fetchImpl = config.fetchImpl ?? globalThis.fetch;
+  if (!fetchImpl) {
+    throw new Error(
+      "createPafiEstimatorClient: no fetch implementation available \u2014 pass `fetchImpl`"
+    );
+  }
+  const url = `${baseUrl.replace(/\/$/, "")}/v1/estimate-gas-fee`;
+  return {
+    async getGasUnits(input) {
+      const body = JSON.stringify({
+        partialUserOp: {
+          sender: input.partialUserOp.sender,
+          // Hex-encode bigint for JSON safety. Sponsor-relayer parses
+          // back to bigint at the DTO layer.
+          nonce: `0x${input.partialUserOp.nonce.toString(16)}`,
+          callData: input.partialUserOp.callData,
+          signature: input.partialUserOp.signature
+        },
+        scenario: input.scenario,
+        contractAddress: input.contractAddress,
+        paymasterAddress: input.paymasterAddress
+      });
+      const res = await fetchImpl(url, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          authorization: `Bearer ${apiKey}`,
+          "x-issuer-id": issuerId
+        },
+        body
+      });
+      if (!res.ok) {
+        let errBody = null;
+        try {
+          errBody = await res.json();
+        } catch {
+        }
+        throw new PafiEstimatorHttpError(res.status, errBody);
+      }
+      const json = await res.json();
+      return {
+        gasUnits: BigInt(json.gasUnits),
+        source: json.source,
+        expiresAt: json.expiresAt
+      };
+    }
+  };
+}
+
 // src/indexer/types.ts
 var InMemoryCursorStore = class {
   cursor;
@@ -1708,8 +1915,59 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
   }
 };
 
-// src/api/handlers/ptRedeemHandler.ts
+// src/api/pointTokenDomainResolver.ts
 import { getAddress as getAddress6 } from "viem";
+var NAME_ABI = [
+  {
+    type: "function",
+    name: "name",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ type: "string" }]
+  }
+];
+var PointTokenDomainResolver = class {
+  provider;
+  overrides;
+  cache = /* @__PURE__ */ new Map();
+  constructor(config) {
+    this.provider = config.provider;
+    this.overrides = /* @__PURE__ */ new Map();
+    if (config.overrides) {
+      for (const [addr, name] of Object.entries(config.overrides)) {
+        this.overrides.set(getAddress6(addr).toLowerCase(), name);
+      }
+    }
+  }
+  async resolve(pointTokenAddress) {
+    const key = getAddress6(pointTokenAddress).toLowerCase();
+    const cached = this.cache.get(key);
+    if (cached !== void 0) return cached;
+    const override = this.overrides.get(key);
+    if (override !== void 0) {
+      this.cache.set(key, override);
+      return override;
+    }
+    const name = await this.provider.readContract({
+      address: pointTokenAddress,
+      abi: NAME_ABI,
+      functionName: "name"
+    });
+    this.cache.set(key, name);
+    return name;
+  }
+  /** Invalidate one address (after deploy / proxy upgrade) or all. */
+  invalidate(pointTokenAddress) {
+    if (pointTokenAddress) {
+      this.cache.delete(getAddress6(pointTokenAddress).toLowerCase());
+    } else {
+      this.cache.clear();
+    }
+  }
+};
+
+// src/api/handlers/ptRedeemHandler.ts
+import { getAddress as getAddress7 } from "viem";
 import {
   signBurnRequest,
   POINT_TOKEN_ABI as POINT_TOKEN_ABI2,
@@ -1735,10 +1993,9 @@ var PTRedeemHandler = class {
   relayService;
   provider;
   feeService;
-  pointTokenAddress;
   batchExecutorAddress;
   chainId;
-  domain;
+  domainResolver;
   burnerSignerWallet;
   redeemLockDurationMs;
   signatureDeadlineSeconds;
@@ -1775,10 +2032,9 @@ var PTRedeemHandler = class {
     this.relayService = config.relayService;
     this.provider = config.provider;
     this.feeService = config.feeService;
-    this.pointTokenAddress = getAddress6(config.pointTokenAddress);
-    this.batchExecutorAddress = getAddress6(config.batchExecutorAddress);
+    this.batchExecutorAddress = getAddress7(config.batchExecutorAddress);
     this.chainId = config.chainId;
-    this.domain = config.domain;
+    this.domainResolver = config.domainResolver;
     this.burnerSignerWallet = config.burnerSignerWallet;
     if (this.burnerSignerWallet?.account?.type === "local") {
       console.warn("[PAFI] PTRedeemHandler: burnerSignerWallet uses a local (private key) account. Use a KMS-backed signer in production.");
@@ -1791,7 +2047,7 @@ var PTRedeemHandler = class {
     }
   }
   async handle(request) {
-    if (getAddress6(request.authenticatedAddress) !== getAddress6(request.userAddress)) {
+    if (getAddress7(request.authenticatedAddress) !== getAddress7(request.userAddress)) {
       throw new PTRedeemError(
         "UNAUTHORIZED",
         `userAddress (${request.userAddress}) does not match authenticated session (${request.authenticatedAddress})`
@@ -1800,11 +2056,12 @@ var PTRedeemHandler = class {
     if (request.amount <= 0n) {
       throw new PTRedeemError("INVALID_AMOUNT", "redeem amount must be positive");
     }
+    const pointTokenAddress = getAddress7(request.pointTokenAddress);
     if (this.redemptionService) {
       const decision = await this.redemptionService.evaluate(
         request.userAddress,
         request.amount,
-        this.pointTokenAddress
+        pointTokenAddress
       );
       if (!decision.allowed) {
         const denial = decision.denial;
@@ -1818,7 +2075,7 @@ var PTRedeemHandler = class {
     let burnNonce;
     try {
       burnNonce = await this.provider.readContract({
-        address: this.pointTokenAddress,
+        address: pointTokenAddress,
         abi: POINT_TOKEN_ABI2,
         functionName: "burnRequestNonces",
         args: [request.userAddress]
@@ -1829,32 +2086,50 @@ var PTRedeemHandler = class {
         `failed to read burnRequestNonces(${request.userAddress}): ${err instanceof Error ? err.message : String(err)}`
       );
     }
-    const userKey = getAddress6(request.userAddress).toLowerCase();
-    let userNonces = this.inFlightNonces.get(userKey);
+    const nonceKey = `${getAddress7(request.userAddress).toLowerCase()}:${pointTokenAddress.toLowerCase()}`;
+    let userNonces = this.inFlightNonces.get(nonceKey);
     if (!userNonces) {
       userNonces = /* @__PURE__ */ new Set();
-      this.inFlightNonces.set(userKey, userNonces);
+      this.inFlightNonces.set(nonceKey, userNonces);
     }
     if (userNonces.has(burnNonce)) {
       throw new PTRedeemError(
         "NONCE_IN_FLIGHT",
-        `A burn request for nonce ${burnNonce} is already in progress for ${request.userAddress}. Retry after the current request completes.`
+        `A burn request for nonce ${burnNonce} is already in progress for ${request.userAddress} on ${pointTokenAddress}. Retry after the current request completes.`
       );
     }
     userNonces.add(burnNonce);
     try {
-      return await this._handleAfterNonceLock(request, burnNonce);
+      return await this._handleAfterNonceLock(request, burnNonce, pointTokenAddress);
     } finally {
       userNonces.delete(burnNonce);
-      if (userNonces.size === 0) this.inFlightNonces.delete(userKey);
+      if (userNonces.size === 0) this.inFlightNonces.delete(nonceKey);
     }
   }
-  async _handleAfterNonceLock(request, burnNonce) {
+  async _handleAfterNonceLock(request, burnNonce, pointTokenAddress) {
+    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,
+        amount: request.amount,
+        deadline: previewDeadline
+      });
+      fee = await this.feeService.estimateGasFee({
+        scenario: "burn",
+        contractAddress: pointTokenAddress,
+        partialUserOp: {
+          sender: previewUserOp.sender,
+          nonce: previewUserOp.nonce,
+          callData: previewUserOp.callData
+        }
+      });
     } else {
       fee = 0n;
     }
@@ -1867,7 +2142,7 @@ var PTRedeemHandler = class {
     }
     const onChainBalance = await getPointTokenBalance2(
       this.provider,
-      this.pointTokenAddress,
+      pointTokenAddress,
       request.userAddress
     );
     if (onChainBalance < request.amount) {
@@ -1876,13 +2151,12 @@ 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 domainName = await this.domainResolver.resolve(pointTokenAddress);
     const domain = {
-      name: this.domain.name,
+      name: domainName,
       chainId: this.chainId,
-      verifyingContract: this.domain.verifyingContract ?? this.pointTokenAddress
+      verifyingContract: pointTokenAddress
     };
     const sponsoredBurnAmount = request.amount - fee;
     const sponsoredBurnRequest = {
@@ -1904,14 +2178,14 @@ var PTRedeemHandler = class {
       request.userAddress,
       sponsoredBurnAmount,
       this.redeemLockDurationMs,
-      this.pointTokenAddress
+      pointTokenAddress
     );
     try {
       const sponsoredUserOp = await this.relayService.prepareBurn({
         mode: "burnWithSig",
         userAddress: request.userAddress,
         aaNonce: request.aaNonce,
-        pointTokenAddress: this.pointTokenAddress,
+        pointTokenAddress,
         batchExecutorAddress: this.batchExecutorAddress,
         burnRequest: sponsoredBurnRequest,
         burnerSignature: sponsoredSig,
@@ -1939,7 +2213,7 @@ var PTRedeemHandler = class {
           request.userAddress,
           request.amount,
           this.redeemLockDurationMs,
-          this.pointTokenAddress
+          pointTokenAddress
         );
         let fallbackUserOp;
         try {
@@ -1947,7 +2221,7 @@ var PTRedeemHandler = class {
             mode: "burnWithSig",
             userAddress: request.userAddress,
             aaNonce: request.aaNonce,
-            pointTokenAddress: this.pointTokenAddress,
+            pointTokenAddress,
             batchExecutorAddress: this.batchExecutorAddress,
             burnRequest: fallbackBurnRequest,
             burnerSignature: fallbackSig,
@@ -1972,7 +2246,7 @@ var PTRedeemHandler = class {
         await this.redemptionService.recordSuccessfulInitiate({
           user: request.userAddress,
           amountPt: request.amount,
-          pointTokenAddress: this.pointTokenAddress,
+          pointTokenAddress,
           reservationId: sponsoredLockId
         }).catch(() => {
         });
@@ -2095,7 +2369,7 @@ async function handleRedeemStatus(params) {
 }
 
 // src/api/mobileHandlers.ts
-import { getAddress as getAddress7 } from "viem";
+import { getAddress as getAddress8 } from "viem";
 import {
   ENTRY_POINT_V08,
   parseEip7702DelegatedAddress
@@ -2447,7 +2721,7 @@ async function handleMobileSubmit(params) {
   if (!entry) {
     throw new PendingUserOpNotFoundError(params.lockId);
   }
-  if (getAddress7(entry.sender) !== getAddress7(params.authenticatedAddress)) {
+  if (getAddress8(entry.sender) !== getAddress8(params.authenticatedAddress)) {
     throw new PendingUserOpForbiddenError(params.lockId);
   }
   const variant = params.variant ?? "sponsored";
@@ -2463,7 +2737,7 @@ async function handleMobileSubmit(params) {
 }
 
 // src/api/handlers/ptClaimHandler.ts
-import { getAddress as getAddress8 } from "viem";
+import { getAddress as getAddress9 } from "viem";
 import {
   decodeBatchExecuteCalls,
   getContractAddresses as getContractAddresses3
@@ -2512,7 +2786,7 @@ var PTClaimHandler = class {
     };
   }
   async handle(request) {
-    if (getAddress8(request.authenticatedAddress) !== getAddress8(request.userAddress)) {
+    if (getAddress9(request.authenticatedAddress) !== getAddress9(request.userAddress)) {
       throw new PTClaimError(
         "VALIDATION_FAILED",
         `userAddress (${request.userAddress}) does not match authenticated session (${request.authenticatedAddress})`
@@ -2550,9 +2824,28 @@ 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 domainName = await this.cfg.domainResolver.resolve(
+        request.pointTokenAddress
+      );
       const domain = {
-        name: this.cfg.pointTokenDomainName,
+        name: domainName,
         chainId: request.chainId,
         verifyingContract: request.pointTokenAddress
       };
@@ -2767,7 +3060,7 @@ import {
   getContractAddresses as getContractAddresses5,
   serializeUserOpToJsonRpc as serializeUserOpToJsonRpc2
 } from "@pafi-dev/core";
-import { getAddress as getAddress9 } from "viem";
+import { getAddress as getAddress10 } from "viem";
 var DEFAULT_DELEGATE_GAS = {
   callGasLimit: 100000n,
   verificationGasLimit: 150000n,
@@ -2854,7 +3147,7 @@ async function handleDelegateSubmit(params) {
   if (!entry) {
     throw new PendingUserOpNotFoundError(params.lockId);
   }
-  if (getAddress9(entry.sender) !== getAddress9(params.authenticatedAddress)) {
+  if (getAddress10(entry.sender) !== getAddress10(params.authenticatedAddress)) {
     throw new PendingUserOpForbiddenError(params.lockId);
   }
   if (!entry.eip7702Auth) {
@@ -2875,7 +3168,7 @@ async function handleDelegateSubmit(params) {
 
 // src/api/issuerApiAdapter.ts
 import { randomUUID } from "crypto";
-import { getAddress as getAddress10 } from "viem";
+import { getAddress as getAddress11 } from "viem";
 import {
   buildAndSignSponsorAuth,
   decodeBatchExecuteCalls as decodeBatchExecuteCalls3,
@@ -2940,7 +3233,7 @@ var IssuerApiAdapter = class {
   async pools(authenticatedAddress, chainId, pointTokenAddress) {
     const result = await this.cfg.issuerService.api.handlePools(
       authenticatedAddress,
-      { chainId, pointTokenAddress: getAddress10(pointTokenAddress) }
+      { chainId, pointTokenAddress: getAddress11(pointTokenAddress) }
     );
     return { pools: result.pools };
   }
@@ -2949,8 +3242,8 @@ var IssuerApiAdapter = class {
       authenticatedAddress,
       {
         chainId,
-        userAddress: getAddress10(userAddress),
-        pointTokenAddress: getAddress10(pointTokenAddress)
+        userAddress: getAddress11(userAddress),
+        pointTokenAddress: getAddress11(pointTokenAddress)
       }
     );
     return {
@@ -2971,7 +3264,7 @@ var IssuerApiAdapter = class {
       "ptClaimHandler",
       "claim"
     );
-    const pointTokenAddress = getAddress10(input.pointTokenAddress);
+    const pointTokenAddress = getAddress11(input.pointTokenAddress);
     const result = await ptClaimHandler.handle({
       authenticatedAddress: input.authenticatedAddress,
       userAddress: input.authenticatedAddress,
@@ -2998,9 +3291,11 @@ var IssuerApiAdapter = class {
   }
   async redeem(input) {
     this.assertRedeemHandler();
+    const pointTokenAddress = getAddress11(input.pointTokenAddress);
     const response = await this.cfg.ptRedeemHandler.handle({
       userAddress: input.authenticatedAddress,
       authenticatedAddress: input.authenticatedAddress,
+      pointTokenAddress,
       amount: input.amount,
       aaNonce: input.aaNonce,
       chainId: input.chainId
@@ -3066,7 +3361,7 @@ var IssuerApiAdapter = class {
       "ptClaimHandler",
       "claimPrepare"
     );
-    const pointTokenAddress = getAddress10(input.pointTokenAddress);
+    const pointTokenAddress = getAddress11(input.pointTokenAddress);
     const claimResult = await ptClaimHandler.handle({
       authenticatedAddress: input.authenticatedAddress,
       userAddress: input.authenticatedAddress,
@@ -3112,10 +3407,11 @@ var IssuerApiAdapter = class {
   }
   async redeemPrepare(input) {
     this.assertRedeemHandler();
-    const pointTokenAddress = getAddress10(input.pointTokenAddress);
+    const pointTokenAddress = getAddress11(input.pointTokenAddress);
     const redeemResponse = await this.cfg.ptRedeemHandler.handle({
       userAddress: input.authenticatedAddress,
       authenticatedAddress: input.authenticatedAddress,
+      pointTokenAddress,
       amount: input.amount,
       aaNonce: input.aaNonce,
       chainId: input.chainId
@@ -3863,7 +4159,7 @@ var PafiBackendClient = class {
 };
 
 // src/config.ts
-import { getAddress as getAddress11 } from "viem";
+import { getAddress as getAddress12 } from "viem";
 import { getContractAddresses as getContractAddresses7 } from "@pafi-dev/core";
 
 // src/redemption/evaluator.ts
@@ -4192,7 +4488,7 @@ function createIssuerService(config) {
       "createIssuerService: at least one of pointTokenAddress / pointTokenAddresses is required"
     );
   }
-  const tokenAddresses = rawAddresses.map((a) => getAddress11(a));
+  const tokenAddresses = rawAddresses.map((a) => getAddress12(a));
   const ledger = config.ledger;
   const sessionStore = config.sessionStore ?? new MemorySessionStore();
   const policy = config.policy ?? new DefaultPolicyEngine({ ledger });
@@ -4311,7 +4607,7 @@ function createIssuerService(config) {
 }
 
 // src/issuer-state/validator.ts
-import { getAddress as getAddress12 } from "viem";
+import { getAddress as getAddress13 } from "viem";
 import {
   POINT_TOKEN_ABI as POINT_TOKEN_ABI3,
   issuerRegistryAbi,
@@ -4343,7 +4639,7 @@ var IssuerStateValidator = class _IssuerStateValidator {
    */
   invalidate(pointToken) {
     if (pointToken) {
-      const key = getAddress12(pointToken);
+      const key = getAddress13(pointToken);
       this.pointTokenIssuerCache.delete(key);
       this.stateCache.delete(key);
       this.inflight.delete(key);
@@ -4358,7 +4654,7 @@ var IssuerStateValidator = class _IssuerStateValidator {
    * The issuer field is set at `initialize()` and never changes.
    */
   async getIssuerAddressForPointToken(pointToken) {
-    const key = getAddress12(pointToken);
+    const key = getAddress13(pointToken);
     const cached = this.pointTokenIssuerCache.get(key);
     if (cached) return cached;
     const issuer = await this.provider.readContract({
@@ -4366,15 +4662,15 @@ var IssuerStateValidator = class _IssuerStateValidator {
       abi: POINT_TOKEN_ABI3,
       functionName: "issuer"
     });
-    this.pointTokenIssuerCache.set(key, getAddress12(issuer));
-    return getAddress12(issuer);
+    this.pointTokenIssuerCache.set(key, getAddress13(issuer));
+    return getAddress13(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 = getAddress12(pointToken);
+    const tokenAddr = getAddress13(pointToken);
     const now = Date.now();
     const cached = this.stateCache.get(tokenAddr);
     if (cached && cached.expiresAt > now) return cached.value;
@@ -4517,7 +4813,7 @@ var MemoryRedemptionHistoryStore = class {
 };
 
 // src/index.ts
-var PAFI_ISSUER_SDK_VERSION = true ? "0.19.0" : "dev";
+var PAFI_ISSUER_SDK_VERSION = true ? "0.21.0" : "dev";
 export {
   AdapterMisconfiguredError,
   AuthError,
@@ -4549,12 +4845,14 @@ export {
   PTRedeemHandler,
   PafiBackendClient,
   PafiBackendError,
+  PafiEstimatorHttpError,
   PafiSdkError,
   PendingUserOpForbiddenError,
   PendingUserOpNotFoundError,
   PerpDepositError,
   PerpDepositHandler,
   PointIndexer,
+  PointTokenDomainResolver,
   PolicyProvider,
   REDEMPTION_HISTORY_WINDOW_SEC,
   RedemptionService,
@@ -4569,6 +4867,7 @@ export {
   buildSdkErrorBody,
   createIssuerService,
   createNativePtQuoter,
+  createPafiEstimatorClient,
   createSdkErrorMapper,
   createSubgraphNativeUsdtQuoter,
   createSubgraphPoolsProvider,