@pafi-dev/issuer 0.23.0 → 0.25.0

package/dist/index.js

@@ -579,12 +579,14 @@ import {
   erc20Abi
 } from "viem";
 import {
-  POINT_TOKEN_ABI,
+  POINT_TOKEN_MINT_SIG_ABI,
+  POINT_TOKEN_BURN_SIG_ABI,
   mintFeeWrapperAbi,
   buildPartialUserOperation,
   signMintRequest,
   getContractAddresses,
-  quoteOperatorFeePt
+  quoteOperatorFeePt,
+  Source
 } from "@pafi-dev/core";
 var RelayService = class {
   provider;
@@ -673,6 +675,7 @@ var RelayService = class {
         "prepareMint: deadline exceeds maximum allowed window (1 hour)"
       );
     }
+    const MINT_SOURCE = Source.EQUITY;
     const useWrapper = params.mintFeeWrapperAddress !== void 0;
     const receiverForSig = useWrapper ? params.mintFeeWrapperAddress : params.userAddress;
     let minterSig;
@@ -684,6 +687,7 @@ var RelayService = class {
           user: params.userAddress,
           receiver: receiverForSig,
           amount: params.amount,
+          source: MINT_SOURCE,
           nonce: params.mintRequestNonce,
           deadline: params.deadline
         }
@@ -714,9 +718,15 @@ var RelayService = class {
         mintTarget = params.mintFeeWrapperAddress;
       } else {
         mintCallData = encodeFunctionData({
-          abi: POINT_TOKEN_ABI,
+          abi: POINT_TOKEN_MINT_SIG_ABI,
           functionName: "mint",
-          args: [params.userAddress, params.amount, params.deadline, minterSig]
+          args: [
+            params.userAddress,
+            params.amount,
+            MINT_SOURCE,
+            params.deadline,
+            minterSig
+          ]
         });
         mintTarget = params.pointTokenAddress;
       }
@@ -801,11 +811,12 @@ var RelayService = class {
     let burnCallData;
     try {
       burnCallData = encodeFunctionData({
-        abi: POINT_TOKEN_ABI,
+        abi: POINT_TOKEN_BURN_SIG_ABI,
         functionName: "burn",
         args: [
           params.burnRequest.from,
           params.burnRequest.amount,
+          params.burnRequest.source,
           params.burnRequest.deadline,
           params.burnerSignature
         ]
@@ -900,11 +911,12 @@ var RelayService = class {
       mintTarget = params.mintFeeWrapperAddress;
     } else {
       mintCallData = encodeFunctionData({
-        abi: POINT_TOKEN_ABI,
+        abi: POINT_TOKEN_MINT_SIG_ABI,
         functionName: "mint",
         args: [
           params.userAddress,
           params.amount,
+          Source.EQUITY,
           params.deadline,
           PLACEHOLDER_SIG_65
         ]
@@ -926,11 +938,12 @@ var RelayService = class {
   /** Burn-side mirror of `previewMintUserOp`. */
   previewBurnUserOp(params) {
     const burnCallData = encodeFunctionData({
-      abi: POINT_TOKEN_ABI,
+      abi: POINT_TOKEN_BURN_SIG_ABI,
       functionName: "burn",
       args: [
         params.userAddress,
         params.amount,
+        Source.EQUITY,
         params.deadline,
         PLACEHOLDER_SIG_65
       ]
@@ -1148,6 +1161,16 @@ var InMemoryCursorStore = class _InMemoryCursorStore {
 
 // src/indexer/pointIndexer.ts
 import { getAddress as getAddress3, parseAbiItem } from "viem";
+var PointIndexerFinalizeError = class extends Error {
+  constructor(message, context, cause) {
+    super(message);
+    this.context = context;
+    this.cause = cause;
+    this.name = "PointIndexerFinalizeError";
+  }
+  context;
+  cause;
+};
 var TRANSFER_EVENT = parseAbiItem(
   "event Transfer(address indexed from, address indexed to, uint256 value)"
 );
@@ -1373,8 +1396,18 @@ var PointIndexer = class {
         evt.txHash,
         this.pointTokenAddress
       );
-    } catch {
-      return;
+    } catch (err) {
+      throw new PointIndexerFinalizeError(
+        `PointIndexer.deductBalance failed for tx ${evt.txHash} (to=${evt.to}, amount=${evt.amount}, block=${evt.blockNumber}); cursor will NOT advance, next tick retries.`,
+        {
+          pointToken: this.pointTokenAddress,
+          to: evt.to,
+          amount: evt.amount,
+          txHash: evt.txHash,
+          blockNumber: evt.blockNumber
+        },
+        err
+      );
     }
     try {
       await this.ledger.updateMintStatus(match.lockId, "MINTED", evt.txHash);
@@ -1396,6 +1429,16 @@ function pickMatchingLock(locks, amount) {
 
 // src/indexer/burnIndexer.ts
 import { getAddress as getAddress4, parseAbiItem as parseAbiItem2 } from "viem";
+var BurnIndexerFinalizeError = class extends Error {
+  constructor(message, context, cause) {
+    super(message);
+    this.context = context;
+    this.cause = cause;
+    this.name = "BurnIndexerFinalizeError";
+  }
+  context;
+  cause;
+};
 var TRANSFER_EVENT2 = parseAbiItem2(
   "event Transfer(address indexed from, address indexed to, uint256 value)"
 );
@@ -1563,7 +1606,18 @@ var BurnIndexer = class {
     try {
       await this.ledger.resolveCreditByBurnTx(lockId, evt.txHash);
     } catch (err) {
-      console.error("[PAFI] BurnIndexer finalize error \u2014 credit may be lost:", err);
+      throw new BurnIndexerFinalizeError(
+        `BurnIndexer.resolveCreditByBurnTx failed for tx ${evt.txHash} (lockId=${lockId}, from=${evt.from}, amount=${evt.amount}, block=${evt.blockNumber}); cursor will NOT advance, next tick retries.`,
+        {
+          pointToken: this.pointTokenAddress,
+          from: evt.from,
+          amount: evt.amount,
+          txHash: evt.txHash,
+          blockNumber: evt.blockNumber,
+          lockId
+        },
+        err
+      );
     }
   }
 };
@@ -1611,7 +1665,6 @@ function hashKeyToInt64(key) {
 import { getAddress as getAddress5 } from "viem";
 import {
   getMintFeeBps,
-  getMintRequestNonce,
   getPointTokenBalance,
   isMinter
 } from "@pafi-dev/core";
@@ -1883,14 +1936,12 @@ var IssuerApiHandlers = class _IssuerApiHandlers {
         { requested: pointToken }
       );
     }
-    const [mintRequestNonce, offChainBalance, onChainBalance, minter] = await Promise.all([
-      getMintRequestNonce(this.provider, pointToken, normalizedAuthed),
+    const [offChainBalance, onChainBalance, minter] = await Promise.all([
       this.ledger.getBalance(normalizedAuthed, pointToken),
       getPointTokenBalance(this.provider, pointToken, normalizedAuthed),
       isMinter(this.provider, pointToken, normalizedAuthed)
     ]);
     return {
-      mintRequestNonce,
       offChainBalance,
       onChainBalance,
       totalBalance: offChainBalance + onChainBalance,
@@ -2027,12 +2078,14 @@ var PointTokenDomainResolver = class {
 import { getAddress as getAddress7 } from "viem";
 import {
   signBurnRequest,
-  POINT_TOKEN_ABI as POINT_TOKEN_ABI2,
+  POINT_TOKEN_ABI,
   getPointTokenBalance as getPointTokenBalance2,
-  getContractAddresses as getContractAddresses2
+  getContractAddresses as getContractAddresses2,
+  Source as Source2
 } from "@pafi-dev/core";
 var DEFAULT_REDEEM_LOCK_MS = 15 * 60 * 1e3;
-var DEFAULT_SIG_DEADLINE_SEC = 15 * 60;
+var M11_SAFETY_MARGIN_MS = 30 * 1e3;
+var DEFAULT_SIG_DEADLINE_SEC = (DEFAULT_REDEEM_LOCK_MS - M11_SAFETY_MARGIN_MS) / 1e3;
 var PTRedeemError = class extends PafiSdkError {
   httpStatus = "unprocessable";
   code;
@@ -2099,6 +2152,13 @@ var PTRedeemHandler = class {
     this.redeemLockDurationMs = config.redeemLockDurationMs ?? DEFAULT_REDEEM_LOCK_MS;
     this.signatureDeadlineSeconds = config.signatureDeadlineSeconds ?? DEFAULT_SIG_DEADLINE_SEC;
     this.now = config.now ?? (() => Date.now());
+    const maxAllowedSignatureMs = this.redeemLockDurationMs - M11_SAFETY_MARGIN_MS;
+    if (this.signatureDeadlineSeconds * 1e3 > maxAllowedSignatureMs) {
+      throw new PTRedeemError(
+        "INVALID_AMOUNT",
+        `PTRedeemHandler config: signatureDeadlineSeconds (${this.signatureDeadlineSeconds}s) must be at most redeemLockDurationMs - safety margin = ${maxAllowedSignatureMs / 1e3}s (redeemLockDurationMs=${this.redeemLockDurationMs / 1e3}s, safety=${M11_SAFETY_MARGIN_MS / 1e3}s). See audit M-11.`
+      );
+    }
     if (config.redemptionService) {
       this.redemptionService = config.redemptionService;
     }
@@ -2133,7 +2193,7 @@ var PTRedeemHandler = class {
     try {
       burnNonce = await this.provider.readContract({
         address: pointTokenAddress,
-        abi: POINT_TOKEN_ABI2,
+        abi: POINT_TOKEN_ABI,
         functionName: "burnRequestNonces",
         args: [request.userAddress]
       });
@@ -2164,8 +2224,14 @@ var PTRedeemHandler = class {
     }
   }
   async _handleAfterNonceLock(request, burnNonce, pointTokenAddress) {
+    const referenceMs = this.now();
+    const projectedLockExpiresAtMs = referenceMs + this.redeemLockDurationMs;
+    const requestedDeadlineSec = Math.floor(referenceMs / 1e3) + this.signatureDeadlineSeconds;
+    const lockBoundedDeadlineSec = Math.floor(
+      (projectedLockExpiresAtMs - M11_SAFETY_MARGIN_MS) / 1e3
+    );
     const previewDeadline = BigInt(
-      Math.floor(this.now() / 1e3) + this.signatureDeadlineSeconds
+      Math.min(requestedDeadlineSec, lockBoundedDeadlineSec)
     );
     let fee;
     if (request.feeAmount !== void 0) {
@@ -2173,7 +2239,7 @@ var PTRedeemHandler = class {
     } else if (this.feeService) {
       const previewUserOp = this.relayService.previewBurnUserOp({
         userAddress: request.userAddress,
-        aaNonce: burnNonce,
+        aaNonce: request.aaNonce,
         pointTokenAddress,
         amount: request.amount,
         deadline: previewDeadline
@@ -2215,10 +2281,12 @@ var PTRedeemHandler = class {
       chainId: this.chainId,
       verifyingContract: pointTokenAddress
     };
+    const BURN_SOURCE = Source2.EQUITY;
     const sponsoredBurnAmount = request.amount - fee;
     const sponsoredBurnRequest = {
       from: request.userAddress,
       amount: sponsoredBurnAmount,
+      source: BURN_SOURCE,
       nonce: burnNonce,
       deadline
     };
@@ -2254,6 +2322,7 @@ var PTRedeemHandler = class {
         const fallbackBurnRequest = {
           from: request.userAddress,
           amount: request.amount,
+          source: BURN_SOURCE,
           nonce: burnNonce,
           deadline
         };
@@ -2796,6 +2865,7 @@ async function handleMobileSubmit(params) {
 // src/api/handlers/ptClaimHandler.ts
 import { getAddress as getAddress9 } from "viem";
 import {
+  POINT_TOKEN_ABI as POINT_TOKEN_ABI2,
   decodeBatchExecuteCalls,
   getContractAddresses as getContractAddresses3
 } from "@pafi-dev/core";
@@ -2831,14 +2901,30 @@ function isNoWrapper2(address) {
   return lower === "0x0000000000000000000000000000000000000000" || lower === "0x000000000000000000000000000000000000dead";
 }
 var DEFAULT_LOCK_MS = 15 * 60 * 1e3;
-var DEFAULT_SIG_DEADLINE_SEC2 = 15 * 60;
+var M11_SAFETY_MARGIN_MS2 = 30 * 1e3;
+var DEFAULT_SIG_DEADLINE_SEC2 = (DEFAULT_LOCK_MS - M11_SAFETY_MARGIN_MS2) / 1e3;
 var PTClaimHandler = class {
   cfg;
+  inFlightNonces = /* @__PURE__ */ new Map();
   constructor(config) {
+    const lockDurationMs = config.lockDurationMs ?? DEFAULT_LOCK_MS;
+    const signatureDeadlineSeconds = config.signatureDeadlineSeconds ?? DEFAULT_SIG_DEADLINE_SEC2;
+    const maxAllowedSignatureMs = lockDurationMs - M11_SAFETY_MARGIN_MS2;
+    if (signatureDeadlineSeconds * 1e3 > maxAllowedSignatureMs) {
+      throw new PTClaimError(
+        "VALIDATION_FAILED",
+        `PTClaimHandler config: signatureDeadlineSeconds (${signatureDeadlineSeconds}s) must be at most lockDurationMs - safety margin = ${maxAllowedSignatureMs / 1e3}s (lockDurationMs=${lockDurationMs / 1e3}s, safety=${M11_SAFETY_MARGIN_MS2 / 1e3}s). See audit M-11.`,
+        {
+          lockDurationMs,
+          signatureDeadlineSeconds,
+          maxAllowedSignatureSec: maxAllowedSignatureMs / 1e3
+        }
+      );
+    }
     this.cfg = {
       ...config,
-      lockDurationMs: config.lockDurationMs ?? DEFAULT_LOCK_MS,
-      signatureDeadlineSeconds: config.signatureDeadlineSeconds ?? DEFAULT_SIG_DEADLINE_SEC2,
+      lockDurationMs,
+      signatureDeadlineSeconds,
       now: config.now ?? (() => Date.now())
     };
   }
@@ -2868,77 +2954,82 @@ var PTClaimHandler = class {
     }
     const chainAddresses = getContractAddresses3(request.chainId);
     const { batchExecutor: batchExecutorAddress } = chainAddresses;
+    let mintRequestNonce;
+    try {
+      mintRequestNonce = await this.cfg.provider.readContract({
+        address: request.pointTokenAddress,
+        abi: POINT_TOKEN_ABI2,
+        functionName: "mintRequestNonces",
+        args: [request.userAddress]
+      });
+    } catch (err) {
+      throw new PTClaimError(
+        "NONCE_READ_FAILED",
+        `failed to read mintRequestNonces(${request.userAddress}): ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+    const nonceKey = `${getAddress9(request.userAddress).toLowerCase()}:${request.pointTokenAddress.toLowerCase()}`;
+    let userNonces = this.inFlightNonces.get(nonceKey);
+    if (!userNonces) {
+      userNonces = /* @__PURE__ */ new Set();
+      this.inFlightNonces.set(nonceKey, userNonces);
+    }
+    if (userNonces.has(mintRequestNonce)) {
+      throw new PTClaimError(
+        "NONCE_IN_FLIGHT",
+        `concurrent claim for nonce ${mintRequestNonce} in progress; retry after the prior request completes`,
+        { userAddress: request.userAddress, pointToken: request.pointTokenAddress, nonce: mintRequestNonce.toString() }
+      );
+    }
+    userNonces.add(mintRequestNonce);
     const wrapperOverride = this.cfg.mintFeeWrapperAddress;
     const wrapperFromSdk = chainAddresses.mintFeeWrapper;
     const resolvedWrapper = wrapperOverride !== void 0 ? isNoWrapper2(wrapperOverride) ? void 0 : wrapperOverride : isNoWrapper2(wrapperFromSdk) ? void 0 : wrapperFromSdk;
-    const lockId = await this.cfg.ledger.lockForMinting(
-      request.userAddress,
-      request.amount,
-      this.cfg.lockDurationMs,
-      request.pointTokenAddress
-    );
     try {
-      const signatureDeadline = BigInt(
-        Math.floor(this.cfg.now() / 1e3) + this.cfg.signatureDeadlineSeconds
-      );
-      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(
+      const lockCreatedAtMs = this.cfg.now();
+      const lockExpiresAtMs = lockCreatedAtMs + this.cfg.lockDurationMs;
+      const lockId = await this.cfg.ledger.lockForMinting(
+        request.userAddress,
+        request.amount,
+        this.cfg.lockDurationMs,
         request.pointTokenAddress
       );
-      const domain = {
-        name: domainName,
-        chainId: request.chainId,
-        verifyingContract: request.pointTokenAddress
-      };
-      let userOp;
       try {
-        userOp = await this.cfg.relayService.prepareMint({
+        const requestedDeadlineSec = Math.floor(lockCreatedAtMs / 1e3) + this.cfg.signatureDeadlineSeconds;
+        const lockBoundedDeadlineSec = Math.floor(
+          (lockExpiresAtMs - M11_SAFETY_MARGIN_MS2) / 1e3
+        );
+        const signatureDeadline = BigInt(
+          Math.min(requestedDeadlineSec, lockBoundedDeadlineSec)
+        );
+        const previewUserOp = this.cfg.relayService.previewMintUserOp({
           userAddress: request.userAddress,
           aaNonce: request.aaNonce,
-          batchExecutorAddress,
           pointTokenAddress: request.pointTokenAddress,
           amount: request.amount,
-          issuerSignerWallet: this.cfg.issuerSignerWallet,
-          domain,
-          mintRequestNonce: request.mintRequestNonce,
           deadline: signatureDeadline,
-          mintFeeWrapperAddress: resolvedWrapper,
-          // Pass the bundler-estimated `feeAmount` explicitly so the
-          // RelayService skips its legacy `quoteOperatorFeePt` path
-          // (which uses the SDK's old 12_000 bps premium default).
-          // Without this, the response's `feeAmount` (from FeeManager,
-          // 100% premium on top of PAFI's 110% server-side estimate)
-          // would diverge from the actual PT.transfer amount in the
-          // UserOp batch (`quoteOperatorFeePt`'s 120%), and the user
-          // would see one value while the wallet transferred another.
-          feeAmount
+          mintFeeWrapperAddress: resolvedWrapper
         });
-      } catch (err) {
-        throw new PTClaimError(
-          "BUILD_FAILED",
-          `prepareMint failed: ${err instanceof Error ? err.message : String(err)}`
+        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
         );
-      }
-      let fallback;
-      if (feeAmount > 0n) {
+        const domain = {
+          name: domainName,
+          chainId: request.chainId,
+          verifyingContract: request.pointTokenAddress
+        };
+        let userOp;
         try {
-          fallback = await this.cfg.relayService.prepareMint({
+          userOp = await this.cfg.relayService.prepareMint({
             userAddress: request.userAddress,
             aaNonce: request.aaNonce,
             batchExecutorAddress,
@@ -2946,34 +3037,68 @@ var PTClaimHandler = class {
             amount: request.amount,
             issuerSignerWallet: this.cfg.issuerSignerWallet,
             domain,
-            mintRequestNonce: request.mintRequestNonce,
+            mintRequestNonce,
             deadline: signatureDeadline,
-            feeAmount: 0n,
-            mintFeeWrapperAddress: resolvedWrapper
+            mintFeeWrapperAddress: resolvedWrapper,
+            // Pass the bundler-estimated `feeAmount` explicitly so the
+            // RelayService skips its legacy `quoteOperatorFeePt` path
+            // (which uses the SDK's old 12_000 bps premium default).
+            // Without this, the response's `feeAmount` (from FeeManager,
+            // 100% premium on top of PAFI's 110% server-side estimate)
+            // would diverge from the actual PT.transfer amount in the
+            // UserOp batch (`quoteOperatorFeePt`'s 120%), and the user
+            // would see one value while the wallet transferred another.
+            feeAmount
           });
         } catch (err) {
           throw new PTClaimError(
             "BUILD_FAILED",
-            `prepareMint (fallback) failed: ${err instanceof Error ? err.message : String(err)}`
+            `prepareMint failed: ${err instanceof Error ? err.message : String(err)}`
           );
         }
+        let fallback;
+        if (feeAmount > 0n) {
+          try {
+            fallback = await this.cfg.relayService.prepareMint({
+              userAddress: request.userAddress,
+              aaNonce: request.aaNonce,
+              batchExecutorAddress,
+              pointTokenAddress: request.pointTokenAddress,
+              amount: request.amount,
+              issuerSignerWallet: this.cfg.issuerSignerWallet,
+              domain,
+              mintRequestNonce,
+              deadline: signatureDeadline,
+              feeAmount: 0n,
+              mintFeeWrapperAddress: resolvedWrapper
+            });
+          } catch (err) {
+            throw new PTClaimError(
+              "BUILD_FAILED",
+              `prepareMint (fallback) failed: ${err instanceof Error ? err.message : String(err)}`
+            );
+          }
+        }
+        const calls = decodeBatchExecuteCalls(userOp.callData);
+        const callsFallback = fallback ? decodeBatchExecuteCalls(fallback.callData) : void 0;
+        return {
+          userOp,
+          fallback,
+          lockId,
+          feeAmount,
+          signatureDeadline,
+          expiresInSeconds: Math.floor(this.cfg.lockDurationMs / 1e3),
+          calls,
+          callsFallback
+        };
+      } catch (err) {
+        await this.cfg.ledger.releaseLock(lockId).catch(() => {
+        });
+        throw err;
       }
-      const calls = decodeBatchExecuteCalls(userOp.callData);
-      const callsFallback = fallback ? decodeBatchExecuteCalls(fallback.callData) : void 0;
-      return {
-        userOp,
-        fallback,
-        lockId,
-        feeAmount,
-        signatureDeadline,
-        expiresInSeconds: Math.floor(this.cfg.lockDurationMs / 1e3),
-        calls,
-        callsFallback
-      };
-    } catch (err) {
-      await this.cfg.ledger.releaseLock(lockId).catch(() => {
-      });
-      throw err;
+    } finally {
+      userNonces.delete(mintRequestNonce);
+      if (userNonces.size === 0) this.inFlightNonces.delete(nonceKey);
     }
   }
 };
@@ -3312,7 +3437,6 @@ var IssuerApiAdapter = class {
       }
     );
     return {
-      mintRequestNonce: result.mintRequestNonce.toString(),
       offChainBalance: result.offChainBalance.toString(),
       onChainBalance: result.onChainBalance.toString(),
       totalBalance: result.totalBalance.toString(),
@@ -3336,8 +3460,7 @@ var IssuerApiAdapter = class {
       amount: input.amount,
       pointTokenAddress,
       chainId: input.chainId,
-      aaNonce: input.aaNonce,
-      mintRequestNonce: input.mintRequestNonce
+      aaNonce: input.aaNonce
     });
     const sponsorAuth = await this.buildSponsorAuth(
       input.authenticatedAddress,
@@ -3433,8 +3556,7 @@ var IssuerApiAdapter = class {
       amount: input.amount,
       pointTokenAddress,
       chainId: input.chainId,
-      aaNonce: input.aaNonce,
-      mintRequestNonce: input.mintRequestNonce
+      aaNonce: input.aaNonce
     });
     const prepared = await this.runMobilePrepare(
       input.authenticatedAddress,
@@ -4703,8 +4825,7 @@ import { getAddress as getAddress13 } from "viem";
 import {
   POINT_TOKEN_ABI as POINT_TOKEN_ABI3,
   issuerRegistryAbi,
-  getContractAddresses as getContractAddresses8,
-  getTokenCap
+  getContractAddresses as getContractAddresses8
 } from "@pafi-dev/core";
 var ISSUER_RECORD_TTL_MS = 3e4;
 var IssuerStateValidator = class _IssuerStateValidator {
@@ -4805,22 +4926,22 @@ var IssuerStateValidator = class _IssuerStateValidator {
       }
       throw err;
     }
-    const { issuer, totalSupply, hardCap, remaining } = state;
+    const { issuer, equityCap, equitySupply, remaining } = state;
     if (!issuer.active) {
       throw new IssuerStateError(
         "ISSUER_INACTIVE",
-        `Issuer ${issuer.issuerAddress} is deactivated on IssuerRegistry`,
-        { issuer: issuer.issuerAddress, pointToken: issuer.pointToken }
+        `Issuer "${issuer.name}" is deactivated on IssuerRegistry`,
+        { pointToken }
       );
     }
-    if (totalSupply + amount > hardCap) {
+    if (equitySupply + amount > equityCap.hardCap) {
       throw new IssuerStateError(
         "MINT_CAP_EXCEEDED",
-        `Requested ${amount} PT would exceed mint cap. Cap=${hardCap}, minted=${totalSupply}, remaining=${remaining}`,
+        `Requested ${amount} PT would exceed EQUITY mint cap. Cap=${equityCap.hardCap}, equityMinted=${equitySupply}, remaining=${remaining}`,
         {
           requested: amount.toString(),
-          cap: hardCap.toString(),
-          minted: totalSupply.toString(),
+          cap: equityCap.hardCap.toString(),
+          equityMinted: equitySupply.toString(),
           remaining: remaining.toString()
         }
       );
@@ -4836,33 +4957,28 @@ var IssuerStateValidator = class _IssuerStateValidator {
       args: [issuerAddr]
     });
     const issuer = {
-      issuerAddress: issuerStruct.issuerAddress,
       signerAddress: issuerStruct.signerAddress,
       name: issuerStruct.name,
-      symbol: issuerStruct.symbol,
       active: issuerStruct.active,
-      pointToken: issuerStruct.pointToken,
-      mintingOracle: issuerStruct.mintingOracle
+      capitalBase: issuerStruct.capitalBase,
+      basisPoints: Number(issuerStruct.basisPoints)
     };
-    const [tokenCap, totalSupply] = await Promise.all([
-      getTokenCap(this.provider, issuer.mintingOracle, tokenAddr),
-      this.provider.readContract({
-        address: tokenAddr,
-        abi: POINT_TOKEN_ABI3,
-        functionName: "totalSupply"
-      })
-    ]);
-    const tokenCapRecord = {
-      declaredTotalSupply: tokenCap.declaredTotalSupply,
-      capBasisPoints: tokenCap.capBasisPoints
+    const equitySupply = await this.provider.readContract({
+      address: tokenAddr,
+      abi: POINT_TOKEN_ABI3,
+      functionName: "equitySupply"
+    });
+    const hardCap = issuer.capitalBase * BigInt(issuer.basisPoints) / 10000n;
+    const equityCap = {
+      capitalBase: issuer.capitalBase,
+      basisPoints: issuer.basisPoints,
+      hardCap
     };
-    const hardCap = tokenCapRecord.declaredTotalSupply * BigInt(tokenCapRecord.capBasisPoints) / 10000n;
-    const remaining = hardCap > totalSupply ? hardCap - totalSupply : 0n;
+    const remaining = hardCap > equitySupply ? hardCap - equitySupply : 0n;
     return {
       issuer,
-      tokenCap: tokenCapRecord,
-      totalSupply,
-      hardCap,
+      equityCap,
+      equitySupply,
       remaining
     };
   }
@@ -4905,7 +5021,7 @@ var MemoryRedemptionHistoryStore = class {
 };
 
 // src/index.ts
-var PAFI_ISSUER_SDK_VERSION = true ? "0.23.0" : "dev";
+var PAFI_ISSUER_SDK_VERSION = true ? "0.25.0" : "dev";
 export {
   AdapterMisconfiguredError,
   AuthError,
@@ -4913,6 +5029,7 @@ export {
   BundlerNotConfiguredError,
   BundlerRejectedError,
   BurnIndexer,
+  BurnIndexerFinalizeError,
   ConfigurationError,
   DEFAULT_REDEMPTION_POLICY,
   DefaultPolicyEngine,
@@ -4944,6 +5061,7 @@ export {
   PerpDepositError,
   PerpDepositHandler,
   PointIndexer,
+  PointIndexerFinalizeError,
   PointTokenDomainResolver,
   PolicyProvider,
   REDEMPTION_HISTORY_WINDOW_SEC,