near-safe 0.8.8 → 0.9.1

package/dist/esm/types/guards.js

@@ -0,0 +1,83 @@
+import { isEIP712TypedData } from "near-ca";
+import { isAddress, isHex } from "viem";
+export const isUserOperation = (data) => {
+    if (typeof data !== "object" || data === null)
+        return false;
+    const candidate = data;
+    // Required fields
+    const hasRequiredFields = "sender" in candidate &&
+        "nonce" in candidate &&
+        "callData" in candidate &&
+        "maxPriorityFeePerGas" in candidate &&
+        "maxFeePerGas" in candidate &&
+        "verificationGasLimit" in candidate &&
+        "callGasLimit" in candidate &&
+        "preVerificationGas" in candidate;
+    if (!hasRequiredFields)
+        return false;
+    // Type checks for required fields
+    const hasValidRequiredTypes = typeof candidate.sender === "string" &&
+        isAddress(candidate.sender) &&
+        typeof candidate.nonce === "string" &&
+        isHex(candidate.callData) &&
+        isHex(candidate.maxPriorityFeePerGas) &&
+        isHex(candidate.maxFeePerGas) &&
+        isHex(candidate.verificationGasLimit) &&
+        isHex(candidate.callGasLimit) &&
+        isHex(candidate.preVerificationGas);
+    if (!hasValidRequiredTypes)
+        return false;
+    // Optional fields type checks
+    if ("factory" in candidate && candidate.factory !== undefined) {
+        if (typeof candidate.factory !== "string" || !isAddress(candidate.factory))
+            return false;
+    }
+    if ("factoryData" in candidate && candidate.factoryData !== undefined) {
+        if (!isHex(candidate.factoryData))
+            return false;
+    }
+    if ("signature" in candidate && candidate.signature !== undefined) {
+        if (!isHex(candidate.signature))
+            return false;
+    }
+    if ("paymaster" in candidate && candidate.paymaster !== undefined) {
+        if (typeof candidate.paymaster !== "string" ||
+            !isAddress(candidate.paymaster))
+            return false;
+    }
+    if ("paymasterData" in candidate && candidate.paymasterData !== undefined) {
+        if (!isHex(candidate.paymasterData))
+            return false;
+    }
+    if ("paymasterVerificationGasLimit" in candidate &&
+        candidate.paymasterVerificationGasLimit !== undefined) {
+        if (!isHex(candidate.paymasterVerificationGasLimit))
+            return false;
+    }
+    if ("paymasterPostOpGasLimit" in candidate &&
+        candidate.paymasterPostOpGasLimit !== undefined) {
+        if (!isHex(candidate.paymasterPostOpGasLimit))
+            return false;
+    }
+    return true;
+};
+export const parseWithTypeGuard = (data, typeGuard) => {
+    // Case 1: Already the correct type
+    if (typeGuard(data)) {
+        return data;
+    }
+    // Case 2: Stringified data
+    if (typeof data === "string") {
+        try {
+            const parsed = JSON.parse(data);
+            return typeGuard(parsed) ? parsed : null;
+        }
+        catch (error) {
+            return null;
+        }
+    }
+    // Neither valid type nor valid stringified type
+    return null;
+};
+export const parseUserOperation = (data) => parseWithTypeGuard(data, isUserOperation);
+export const parseEip712TypedData = (data) => parseWithTypeGuard(data, isEIP712TypedData);

package/dist/esm/{types.d.ts → types/index.d.ts}

@@ -1,5 +1,6 @@
 import { EIP712TypedData, EncodedSignRequest, FunctionCallTransaction, SignArgs } from "near-ca";
 import { Address, Hex, ParseAbi } from "viem";
+export * from "./guards";
 /**
  * Represents a collection of Safe contract deployments, each with its own address and ABI.
  */
@@ -46,24 +47,20 @@ export interface UnsignedUserOperation {
 /**
  * Supported representation of a user operation for EntryPoint version 0.7, including gas limits and signature.
  */
-export interface UserOperation extends UnsignedUserOperation {
-    /** The gas limit for verification of the operation. */
-    verificationGasLimit: Hex;
-    /** The gas limit for the execution of the operation call. */
-    callGasLimit: Hex;
-    /** The gas used before verification begins. */
-    preVerificationGas: Hex;
+export interface UserOperation extends UnsignedUserOperation, PaymasterData {
     /** Optional signature for the user operation. */
     signature?: Hex;
 }
 /**
  * Represents additional paymaster-related data for a user operation.
  */
-export interface PaymasterData {
+export interface PaymasterData extends UserOperationGas {
     /** Optional paymaster address responsible for covering gas costs. */
     paymaster?: Address;
     /** Optional additional data required by the paymaster. */
     paymasterData?: Hex;
+}
+export interface UserOperationGas {
     /** The gas limit for paymaster verification. */
     paymasterVerificationGasLimit?: Hex;
     /** The gas limit for paymaster post-operation execution. */
@@ -270,4 +267,3 @@ export interface SpendingLimit {
 export interface ChainIds {
     allowlist: number[];
 }
-export {};

package/dist/esm/{types.js → types/index.js}

@@ -1,3 +1,4 @@
+export * from "./guards";
 /**
  * Enum representing the type of operation in a meta-transaction.
  */

package/dist/esm/util.d.ts

@@ -1,6 +1,6 @@
 import { SessionRequestParams } from "near-ca";
 import { Address, Hex, PublicClient } from "viem";
-import { PaymasterData, MetaTransaction } from "./types";
+import { PaymasterData, MetaTransaction, UserOperation } from "./types";
 export declare const PLACEHOLDER_SIG: `0x${string}`;
 type IntLike = Hex | bigint | string | number;
 export declare const packGas: (hi: IntLike, lo: IntLike) => string;
@@ -38,4 +38,5 @@ export declare function signatureFromTxHash(txHash: string, accountId?: string):
  */
 export declare function raceToFirstResolve<T>(promises: Promise<T>[]): Promise<T>;
 export declare function assertUnique<T>(iterable: Iterable<T>, errorMessage?: string): void;
+export declare function userOpTransactionCost(userOp: UserOperation): bigint;
 export {};

package/dist/esm/util.js

@@ -17,13 +17,13 @@ export function packPaymasterData(data) {
         : "0x");
 }
 export function containsValue(transactions) {
-    return transactions.some((tx) => tx.value !== "0");
+    return transactions.some((tx) => BigInt(tx.value) !== 0n);
 }
 export async function isContract(address, chainId) {
     return (await getClient(chainId).getCode({ address })) !== undefined;
 }
 export function getClient(chainId) {
-    // TODO(bh2smith)
+    // TODO(bh2smith): Update defailt client URL in viem for sepolia.
     if (chainId === 11155111) {
         return createPublicClient({ transport: http(DEFAULT_SETUP_RPC) });
     }
@@ -130,3 +130,23 @@ export function assertUnique(iterable, errorMessage = "The collection contains m
         throw new Error(errorMessage);
     }
 }
+export function userOpTransactionCost(userOp) {
+    // Convert values from hex to decimal
+    const preVerificationGas = BigInt(userOp.preVerificationGas);
+    const verificationGasLimit = BigInt(userOp.verificationGasLimit);
+    const callGasLimit = BigInt(userOp.callGasLimit);
+    const paymasterVerificationGasLimit = BigInt(userOp.paymasterVerificationGasLimit || "0x0");
+    const paymasterPostOpGasLimit = BigInt(userOp.paymasterPostOpGasLimit || "0x0");
+    // Sum total gas
+    const totalGasUsed = preVerificationGas +
+        verificationGasLimit +
+        callGasLimit +
+        paymasterVerificationGasLimit +
+        paymasterPostOpGasLimit;
+    // Convert maxFeePerGas from hex to decimal
+    const maxFeePerGas = BigInt(userOp.maxFeePerGas);
+    // Calculate total cost in wei
+    const totalCostInWei = totalGasUsed * maxFeePerGas;
+    // Convert to Ether for a human-readable value
+    return totalCostInWei;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.8.8",
+  "version": "0.9.1",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",
@@ -43,7 +43,7 @@
   "dependencies": {
     "@safe-global/safe-gateway-typescript-sdk": "^3.22.2",
     "near-api-js": "^5.0.1",
-    "near-ca": "^0.7.0",
+    "near-ca": "^0.7.2",
     "semver": "^7.6.3",
     "viem": "^2.21.41"
   },

package/dist/cjs/types.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OperationType = void 0;
-/**
- * Enum representing the type of operation in a meta-transaction.
- */
-var OperationType;
-(function (OperationType) {
-    /** Standard call operation (0). */
-    OperationType[OperationType["Call"] = 0] = "Call";
-    /** Delegate call operation (1). */
-    OperationType[OperationType["DelegateCall"] = 1] = "DelegateCall";
-})(OperationType || (exports.OperationType = OperationType = {}));