@pafi-dev/core 0.5.15 → 0.5.17

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Address, Hex, PublicClient, HttpTransport, WalletClient } from 'viem';
+import { Address, Hex, TypedDataDomain, PublicClient, HttpTransport, WalletClient } from 'viem';
 import { P as PoolKey, C as ChainConfig, a as PafiSDKConfig, b as PointTokenDomainConfig, M as MintRequest, R as ReceiverConsent, E as EIP712Signature, S as SignatureVerification, B as BestQuote, Q as QuoteResult } from './types-JyuXUM8C.js';
 export { c as BurnRequest, I as Issuer, d as PathKey } from './types-JyuXUM8C.js';
 export { pointTokenAbi as POINT_TOKEN_V2_ABI, erc20Abi, issuerRegistryAbi, mintingOracleAbi, permit2Abi, pointTokenAbi, pointTokenFactoryAbi, universalRouterAbi, v4QuoterAbi } from './abi/index.js';
@@ -624,22 +624,67 @@ declare function assembleUserOperation(partial: PartialUserOperation, paymaster:
     paymasterPostOpGasLimit: bigint;
 }, signature: `0x${string}`): UserOperation;
 
+declare const PACKED_USER_OPERATION_TYPES: {
+    readonly PackedUserOperation: readonly [{
+        readonly name: "sender";
+        readonly type: "address";
+    }, {
+        readonly name: "nonce";
+        readonly type: "uint256";
+    }, {
+        readonly name: "initCode";
+        readonly type: "bytes";
+    }, {
+        readonly name: "callData";
+        readonly type: "bytes";
+    }, {
+        readonly name: "accountGasLimits";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "preVerificationGas";
+        readonly type: "uint256";
+    }, {
+        readonly name: "gasFees";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "paymasterAndData";
+        readonly type: "bytes";
+    }];
+};
+type PackedUserOperationMessage = {
+    sender: Address;
+    nonce: bigint;
+    initCode: Hex;
+    callData: Hex;
+    accountGasLimits: Hex;
+    preVerificationGas: bigint;
+    gasFees: Hex;
+    paymasterAndData: Hex;
+};
+type UserOpTypedData = {
+    domain: TypedDataDomain;
+    types: typeof PACKED_USER_OPERATION_TYPES;
+    primaryType: "PackedUserOperation";
+    message: PackedUserOperationMessage;
+};
 /**
- * ERC-4337 v0.8 UserOp hash — EIP-712 typed data with the
- * `PackedUserOperation` struct. Pimlico's `Simple7702Account` (impl
- * `0xe6Cae8...`) returns EntryPoint v0.8 from `entryPoint()`, which
- * computes hashes via EIP-712 (NOT v0.7's `keccak256(packed userOp +
- * entryPoint + chainId)`).
+ * Build the EIP-712 typed-data payload for an ERC-4337 v0.8 UserOp.
  *
- * The hash returned here is what the account's `_validateSignature`
- * recovers signer from. Pimlico's `Simple7702Account` uses
- * `MessageHashUtils.toEthSignedMessageHash(hash)` then ECDSA.recover —
- * matching `personal_sign` on the client side.
+ * The deployed Pimlico `Simple7702Account` (impl `0xe6Cae8...`) validates
+ * the user's signature by calling `SignatureCheckerLib.isValidSignatureNow`
+ * with the **raw** userOpHash (no EIP-191 prefix). For an EOA signer this
+ * means `ecrecover(userOpHash, sig)` must equal the EOA address.
  *
- * Use on the **backend** (mobile prepare/submit) to compute the hash
- * before returning it to the mobile client for personal_sign.
+ * Because `userOpHash` is itself the EIP-712 typed digest of the
+ * `PackedUserOperation` struct, signing the typed data with
+ * `eth_signTypedData_v4` produces a signature whose recover-from-raw-digest
+ * == the userOpHash. That matches what the contract expects.
+ *
+ * Do NOT sign with `personal_sign` / `signMessage({ raw })` — that adds the
+ * EIP-191 prefix, which the contract does not undo, so recovery returns a
+ * different address and the bundler reverts with `AA24 signature error`.
  */
-declare function computeUserOpHash(userOp: {
+declare function buildUserOpTypedData(userOp: {
     sender: Address;
     nonce: bigint;
     callData: Hex;
@@ -652,7 +697,12 @@ declare function computeUserOpHash(userOp: {
     paymasterVerificationGasLimit?: bigint;
     paymasterPostOpGasLimit?: bigint;
     paymasterData?: Hex;
-}, chainId: number): Hex;
+}, chainId: number): UserOpTypedData;
+/**
+ * EIP-712 typed digest of an ERC-4337 v0.8 UserOp. Equals on-chain
+ * `EntryPoint.getUserOpHash(userOp)`.
+ */
+declare function computeUserOpHash(userOp: Parameters<typeof buildUserOpTypedData>[0], chainId: number): Hex;
 
 /**
  * EIP-7702 delegate impls supported by the PAFI mobile prepare/submit
@@ -1508,4 +1558,4 @@ declare class PafiSDK {
     signLoginMessage(message: string): Promise<Hex>;
 }
 
-export { ApiError, BATCH_EXECUTOR_7702_IMPL, BATCH_EXECUTOR_ABI, BATCH_EXECUTOR_ADDRESS_BASE_MAINNET, BATCH_EXECUTOR_ADDRESS_BASE_SEPOLIA, BROKER_HASHES, BestQuote, type BuildDelegationUserOpParams, type BuildPartialUserOpParams, type BuildPerpDepositViaRelayParams, type BuildPerpDepositWithGasDeductionParams, COMMON_POOLS, COMMON_TOKENS, CONTRACT_ADDRESSES, ChainConfig, type CheckEthAndBranchParams, ConfigurationError, type ContractAddresses, DUMMY_SIGNATURE_V07, type DelegateImpl, EIP712Signature, ENTRY_POINT_V07, ENTRY_POINT_V08, LoginMessageParams, MintRequest, type ModalOpenOptions, ORDERLY_RELAY_ABI, ORDERLY_VAULT_ABI, ORDERLY_VAULT_ADDRESSES, ORDERLY_VAULT_BASE_MAINNET, Operation, type OrderlyRelayDepositRequest, PAFI_SUBGRAPH_URL, PERMIT2_ADDRESS, POINT_TOKEN_FACTORY_ADDRESSES, POINT_TOKEN_IMPL_ADDRESSES, POINT_TOKEN_POOLS, type PafiProxyTransportParams, PafiSDK, PafiSDKConfig, PafiSDKError, type PafiWebModalAdapter, type PafiWebModalHandle, PartialUserOperation, type PaymasterConfig, PointTokenDomainConfig, PoolKey, QuoteResult, ReceiverConsent, SIMPLE_7702_IMPL_BASE_MAINNET, SUPPORTED_CHAINS, type SendWithPaymasterFallbackParams, type SignatureStruct, SignatureVerification, SigningError, SimulationError, type SmartAccountSender, type SponsorshipScenario, type SubmissionPath, SwapSimulationResult, TOKEN_HASHES, UNIVERSAL_ROUTER_ADDRESSES, UserOperation, V4_QUOTER_ADDRESSES, type VaultDepositFE, _resetPaymasterConfigForTests, assembleUserOperation, buildDelegationUserOp, buildPartialUserOperation, buildPerpDepositViaRelay, buildPerpDepositWithGasDeduction, burnRequestTypes, checkDelegation, checkEthAndBranch, computeAccountId, computeAuthorizationHash, computeUserOpHash, createPafiProxyTransport, decodeBatchExecuteCalls, detectDelegateImpl, encodeBatchExecute, erc20ApproveOp, erc20BurnOp, erc20TransferOp, fetchPafiPools, getAaNonce, getContractAddresses, getDummySignatureFor7702, getPafiWebModalAdapter, getPaymasterConfig, isDelegatedTo, isDelegatedToTarget, isPaymasterConfigured, isPaymasterError, mintRequestTypes, openPafiWebModal, openWebPopup, parseEip7702DelegatedAddress, rawCallOp, receiverConsentTypes, sendWithPaymasterFallback, serializeUserOpToJsonRpc, setPafiWebModalAdapter, setPaymasterConfig, webPopupAdapter };
+export { ApiError, BATCH_EXECUTOR_7702_IMPL, BATCH_EXECUTOR_ABI, BATCH_EXECUTOR_ADDRESS_BASE_MAINNET, BATCH_EXECUTOR_ADDRESS_BASE_SEPOLIA, BROKER_HASHES, BestQuote, type BuildDelegationUserOpParams, type BuildPartialUserOpParams, type BuildPerpDepositViaRelayParams, type BuildPerpDepositWithGasDeductionParams, COMMON_POOLS, COMMON_TOKENS, CONTRACT_ADDRESSES, ChainConfig, type CheckEthAndBranchParams, ConfigurationError, type ContractAddresses, DUMMY_SIGNATURE_V07, type DelegateImpl, EIP712Signature, ENTRY_POINT_V07, ENTRY_POINT_V08, LoginMessageParams, MintRequest, type ModalOpenOptions, ORDERLY_RELAY_ABI, ORDERLY_VAULT_ABI, ORDERLY_VAULT_ADDRESSES, ORDERLY_VAULT_BASE_MAINNET, Operation, type OrderlyRelayDepositRequest, PAFI_SUBGRAPH_URL, PERMIT2_ADDRESS, POINT_TOKEN_FACTORY_ADDRESSES, POINT_TOKEN_IMPL_ADDRESSES, POINT_TOKEN_POOLS, type PackedUserOperationMessage, type PafiProxyTransportParams, PafiSDK, PafiSDKConfig, PafiSDKError, type PafiWebModalAdapter, type PafiWebModalHandle, PartialUserOperation, type PaymasterConfig, PointTokenDomainConfig, PoolKey, QuoteResult, ReceiverConsent, SIMPLE_7702_IMPL_BASE_MAINNET, SUPPORTED_CHAINS, type SendWithPaymasterFallbackParams, type SignatureStruct, SignatureVerification, SigningError, SimulationError, type SmartAccountSender, type SponsorshipScenario, type SubmissionPath, SwapSimulationResult, TOKEN_HASHES, UNIVERSAL_ROUTER_ADDRESSES, type UserOpTypedData, UserOperation, V4_QUOTER_ADDRESSES, type VaultDepositFE, _resetPaymasterConfigForTests, assembleUserOperation, buildDelegationUserOp, buildPartialUserOperation, buildPerpDepositViaRelay, buildPerpDepositWithGasDeduction, buildUserOpTypedData, burnRequestTypes, checkDelegation, checkEthAndBranch, computeAccountId, computeAuthorizationHash, computeUserOpHash, createPafiProxyTransport, decodeBatchExecuteCalls, detectDelegateImpl, encodeBatchExecute, erc20ApproveOp, erc20BurnOp, erc20TransferOp, fetchPafiPools, getAaNonce, getContractAddresses, getDummySignatureFor7702, getPafiWebModalAdapter, getPaymasterConfig, isDelegatedTo, isDelegatedToTarget, isPaymasterConfigured, isPaymasterError, mintRequestTypes, openPafiWebModal, openWebPopup, parseEip7702DelegatedAddress, rawCallOp, receiverConsentTypes, sendWithPaymasterFallback, serializeUserOpToJsonRpc, setPafiWebModalAdapter, setPaymasterConfig, webPopupAdapter };

package/dist/index.js

@@ -385,7 +385,19 @@ import {
   pad,
   toHex
 } from "viem";
-function computeUserOpHash(userOp, chainId) {
+var PACKED_USER_OPERATION_TYPES = {
+  PackedUserOperation: [
+    { name: "sender", type: "address" },
+    { name: "nonce", type: "uint256" },
+    { name: "initCode", type: "bytes" },
+    { name: "callData", type: "bytes" },
+    { name: "accountGasLimits", type: "bytes32" },
+    { name: "preVerificationGas", type: "uint256" },
+    { name: "gasFees", type: "bytes32" },
+    { name: "paymasterAndData", type: "bytes" }
+  ]
+};
+function buildUserOpTypedData(userOp, chainId) {
   const accountGasLimits = pack128(
     userOp.verificationGasLimit,
     userOp.callGasLimit
@@ -397,25 +409,14 @@ function computeUserOpHash(userOp, chainId) {
     pad(toHex(userOp.paymasterPostOpGasLimit ?? 0n), { size: 16 }),
     userOp.paymasterData ?? "0x"
   ]) : "0x";
-  return hashTypedData({
+  return {
     domain: {
       name: "ERC4337",
       version: "1",
       chainId,
       verifyingContract: ENTRY_POINT_V08
     },
-    types: {
-      PackedUserOperation: [
-        { name: "sender", type: "address" },
-        { name: "nonce", type: "uint256" },
-        { name: "initCode", type: "bytes" },
-        { name: "callData", type: "bytes" },
-        { name: "accountGasLimits", type: "bytes32" },
-        { name: "preVerificationGas", type: "uint256" },
-        { name: "gasFees", type: "bytes32" },
-        { name: "paymasterAndData", type: "bytes" }
-      ]
-    },
+    types: PACKED_USER_OPERATION_TYPES,
     primaryType: "PackedUserOperation",
     message: {
       sender: userOp.sender,
@@ -427,7 +428,11 @@ function computeUserOpHash(userOp, chainId) {
       gasFees,
       paymasterAndData
     }
-  });
+  };
+}
+function computeUserOpHash(userOp, chainId) {
+  const td = buildUserOpTypedData(userOp, chainId);
+  return hashTypedData(td);
 }
 function pack128(hi, lo) {
   return `0x${(hi << 128n | lo).toString(16).padStart(64, "0")}`;
@@ -1143,6 +1148,7 @@ export {
   buildSwapFromQuote,
   buildSwapWithGasDeduction,
   buildUniversalRouterExecuteArgs,
+  buildUserOpTypedData,
   buildV4SwapInput,
   burnRequestTypes,
   checkAllowance,