@pafi-dev/issuer 0.16.0 → 0.18.0

package/dist/index.js

@@ -862,22 +862,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 = 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/gasUnitsCache.ts
+import { keccak256 } from "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 ? 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)
@@ -886,32 +1036,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
@@ -1850,11 +2069,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;
     }
@@ -1876,9 +2113,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,
@@ -2550,7 +2785,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,
@@ -4517,7 +4768,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";
 export {
   AdapterMisconfiguredError,
   AuthError,
@@ -4529,6 +4780,7 @@ export {
   DEFAULT_REDEMPTION_POLICY,
   DefaultPolicyEngine,
   FeeManager,
+  GasUnitsCache,
   InMemoryCursorStore,
   IssuerApiAdapter,
   IssuerApiHandlers,