@mentaproject/client 0.1.35 → 0.1.37

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@mentaproject/client",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "description": "High level EVM library used into the Menta App to facilitate Blockchain interactions. ",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "sideEffects": false,
@@ -11,42 +11,42 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "require": "./dist/index.cjs"
     },
     "./types": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/types/index.mjs",
-      "require": "./dist/types/index.js"
+      "require": "./dist/types/index.cjs"
     },
     "./package.json": "./package.json"
   },
   "scripts": {
     "test:file": "tsx test.ts",
     "test": "jest -i",
-    "build": "tsc --project tsconfig.json",
-    "patch": "npm version patch && npm run build && npm publish --access public",
-    "minor": "npm version minor && npm run build && npm publish --access public",
-    "major": "npm version major && npm run build && npm publish --access public"
+    "build": "tsup && tsc --emitDeclarationOnly",
+    "build:fast": "tsup",
+    "preversion": "npm whoami && npm run build",
+    "postversion": "npm publish --access public && git push --follow-tags || (git tag -d $(git describe --tags --abbrev=0) && git reset --hard HEAD~1 && exit 1)",
+    "patch": "npm version patch",
+    "minor": "npm version minor",
+    "major": "npm version major"
   },
   "author": "@mentaproject",
   "license": "ISC",
   "dependencies": {
     "@mentaproject/contracts": "^0.0.11",
-    "@mentaproject/core": "^0.6.4",
+    "@mentaproject/core": "^0.7.3",
     "@modelcontextprotocol/sdk": "^1.13.0",
     "@shazow/whatsabi": "^0.21.1"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.3",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.2",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.29",
     "jest": "^30.0.2",
     "jest-mock-extended": "^4.0.0",
-    "rollup": "^4.40.1",
     "ts-jest": "^29.4.0",
     "tslib": "^2.8.1",
+    "tsup": "^8.5.1",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3"
   },

package/src/structures/MentaClient.ts

@@ -3,6 +3,7 @@
  */
 import type { MentaAccountClient } from "@mentaproject/core/types";
 import { createMentaAccount } from "@mentaproject/core/clients";
+import { createClient } from "@mentaproject/core";
 
 import { BlockManager } from "../managers/BlockManager";
 import { TransactionManager } from "../managers/TransactionManager";
@@ -15,7 +16,6 @@ import {
   MentaClientConfig,
 } from "../types/MentaClient";
 import { withCache } from "../utils/withCache";
-import { createClient } from "@mentaproject/core";
 import { Account } from "./Account";
 
 /**
@@ -150,10 +150,11 @@ export class MentaClient {
       coreClient = withCache(coreClient, this.params.cache);
     }
 
-    this._rpc = await createMentaAccount(coreClient, {
-      signer: this.params.signer,
+    this._rpc = await createMentaAccount(coreClient as any, {
       bundlerTransport: this.params.bundlerTransport,
       publicTransport: this.params.transport,
+      signer: this.params.signer,
+      validatorAddress: this.params.validatorAddress,
     });
 
     this._account = this.accounts.get(this.rpc.account.address);

package/src/types/MentaClient.ts

@@ -1,14 +1,11 @@
 /**
  * @module MentaClientTypes
  */
-import {
-  CoreClientConfig,
-  PasskeySigner,
-  Transport,
-} from "@mentaproject/core/types";
+import { Address, CoreClientConfig, Transport } from "@mentaproject/core/types";
 import { ICache } from "./Cache";
 import { watchBlockNumber, watchBlocks } from "@mentaproject/core/actions";
 import { IPersistenceAdapter } from "./PersistenceAdapter";
+import { WebAuthnAccount } from "@mentaproject/core/account-abstraction";
 
 /**
  * Configuration for the client's cache.
@@ -46,7 +43,11 @@ export interface MentaClientConfig extends CoreClientConfig {
   /**
    * Passkey compatible signer used for signing user operations
    */
-  signer: PasskeySigner;
+  signer: WebAuthnAccount;
+  /**
+   * Validator address used for userOperations
+   */
+  validatorAddress: Address;
 }
 
 /**

package/src/utils/withCache.ts

@@ -6,6 +6,19 @@ import type { CoreClient } from "@mentaproject/core/types";
 import { ICache } from "../types/Cache";
 import { Methods } from "../types/JsonRPC";
 
+// EntryPoint.getNonce selector - must never be cached to avoid nonce reuse
+const GET_NONCE_SELECTOR = "0x35567e1a";
+
+/**
+ * Checks if an eth_call is a getNonce call to the EntryPoint.
+ * These calls must not be cached to ensure fresh nonce values for each UserOperation.
+ */
+function isNonceCall(method: Methods, params: any): boolean {
+    if (method !== "eth_call") return false;
+    const callData = params?.[0]?.data;
+    return typeof callData === "string" && callData.startsWith(GET_NONCE_SELECTOR);
+}
+
 /**
  * A higher-order function that enhances a class method with caching capabilities.
  * It intercepts RPC requests made through the client and caches their responses
@@ -29,16 +42,21 @@ export function withCache<T extends CoreClient>(client: T, cache: ICache): T {
     client.request = (async (args: { method: Methods, params: any }) => {
         const { method, params } = args;
 
+        // Never cache nonce calls - they must always return fresh values
+        const shouldSkipCache = method === "eth_blockNumber" || isNonceCall(method, params);
+
         const cacheKey = `${client.chain!.id}:${method}:${JSON.stringify(params || [], (_, v) => typeof v === 'bigint' ? v.toString() : v)}`;
 
         let result;
-        if (method !== "eth_blockNumber") result = cache.get(cacheKey);
+        if (!shouldSkipCache) {
+            result = cache.get(cacheKey);
+        }
 
         if (!result) {
             result = await originalRequest(args as any);
         };
 
-        if (result !== null && result !== undefined && method !== "eth_blockNumber") {
+        if (result !== null && result !== undefined && !shouldSkipCache) {
             const ttl = cache.config.ttlPolicies[method] || cache.config.defaultTtl;
             await cache.set(cacheKey, result, ttl);
         }

package/tsup.config.ts

@@ -0,0 +1,18 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: {
+    index: "src/index.ts",
+    "types/index": "src/types/index.ts",
+  },
+  format: ["cjs", "esm"],
+  dts: false,
+  sourcemap: true,
+  clean: false,
+  external: [
+    "@mentaproject/contracts",
+    "@mentaproject/core",
+    "@modelcontextprotocol/sdk",
+    "@shazow/whatsabi",
+  ],
+});