near-safe 0.11.1 → 0.12.0

package/dist/cjs/lib/safe.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafeContractSuite = void 0;
+const near_ca_1 = require("near-ca");
 const viem_1 = require("viem");
 const deployments_1 = require("../_gen/deployments");
 const constants_1 = require("../constants");
@@ -76,7 +77,7 @@ class SafeContractSuite {
     }
     async getOpHash(chainId, unsignedUserOp) {
         const { factory, factoryData, verificationGasLimit, callGasLimit, maxPriorityFeePerGas, maxFeePerGas, } = unsignedUserOp;
-        const client = await (0, util_1.getClient)(chainId);
+        const client = await near_ca_1.Network.fromChainId(chainId).client;
         const opHash = await client.readContract({
             address: this.m4337.address,
             abi: this.m4337.abi,
@@ -132,7 +133,7 @@ class SafeContractSuite {
         };
     }
     async getNonce(address, chainId) {
-        const nonce = (await (0, util_1.getClient)(chainId).readContract({
+        const nonce = (await near_ca_1.Network.fromChainId(chainId).client.readContract({
             abi: this.entryPoint.abi,
             address: this.entryPoint.address,
             functionName: "getNonce",
@@ -141,7 +142,7 @@ class SafeContractSuite {
         return nonce;
     }
     async prevOwner(chainId, safeAddress, owner) {
-        const client = (0, util_1.getClient)(chainId);
+        const client = near_ca_1.Network.fromChainId(chainId).client;
         const currentOwners = await client.readContract({
             address: safeAddress,
             // abi: this.singleton.abi,

package/dist/cjs/near-safe.js

@@ -67,7 +67,9 @@ class NearSafe {
      * @returns {Promise<bigint>} - A promise that resolves to the balance of the Safe account in wei.
      */
     async getBalance(chainId) {
-        return await (0, util_1.getClient)(chainId).getBalance({ address: this.address });
+        return await near_ca_1.Network.fromChainId(chainId).client.getBalance({
+            address: this.address,
+        });
     }
     /**
      * Constructs a user operation for the specified chain, including necessary gas fees, nonce, and paymaster data.

package/dist/cjs/util.d.ts

@@ -1,5 +1,5 @@
 import { SessionRequestParams } from "near-ca";
-import { Address, Hex, PublicClient } from "viem";
+import { Address, Hex } from "viem";
 import { PaymasterData, MetaTransaction, UserOperation } from "./types";
 export declare const PLACEHOLDER_SIG: `0x${string}`;
 type IntLike = Hex | bigint | string | number;
@@ -8,7 +8,6 @@ export declare function packSignature(signature: `0x${string}`, validFrom?: numb
 export declare function packPaymasterData(data: PaymasterData): Hex;
 export declare function containsValue(transactions: MetaTransaction[]): boolean;
 export declare function isContract(address: Address, chainId: number): Promise<boolean>;
-export declare function getClient(chainId: number, rpcUrl?: string): PublicClient;
 export declare function metaTransactionsFromRequest(params: SessionRequestParams): MetaTransaction[];
 export declare function saltNonceFromMessage(input: string): string;
 /**

package/dist/cjs/util.js

@@ -5,7 +5,6 @@ exports.packSignature = packSignature;
 exports.packPaymasterData = packPaymasterData;
 exports.containsValue = containsValue;
 exports.isContract = isContract;
-exports.getClient = getClient;
 exports.metaTransactionsFromRequest = metaTransactionsFromRequest;
 exports.saltNonceFromMessage = saltNonceFromMessage;
 exports.signatureFromTxHash = signatureFromTxHash;
@@ -34,12 +33,8 @@ function containsValue(transactions) {
     return transactions.some((tx) => BigInt(tx.value) !== 0n);
 }
 async function isContract(address, chainId) {
-    return (await getClient(chainId).getCode({ address })) !== undefined;
-}
-function getClient(chainId, rpcUrl) {
-    // Caution: rpcUrl might not be aligned with chainId!
-    const options = rpcUrl ? { rpcUrl } : {};
-    return near_ca_1.Network.fromChainId(chainId, options).client;
+    return ((await near_ca_1.Network.fromChainId(chainId).client.getCode({ address })) !==
+        undefined);
 }
 function metaTransactionsFromRequest(params) {
     let transactions;

package/dist/esm/lib/safe.js

@@ -1,7 +1,8 @@
+import { Network } from "near-ca";
 import { concat, createPublicClient, encodeFunctionData, encodePacked, getAddress, getCreate2Address, http, keccak256, parseAbi, toHex, zeroAddress, } from "viem";
 import { SAFE_DEPLOYMENTS } from "../_gen/deployments";
 import { DEFAULT_SETUP_RPC, SENTINEL_OWNERS, USER_OP_IDENTIFIER, } from "../constants";
-import { PLACEHOLDER_SIG, getClient, packGas, packPaymasterData, } from "../util";
+import { PLACEHOLDER_SIG, packGas, packPaymasterData } from "../util";
 /**
  * All contracts used in account creation & execution
  */
@@ -80,7 +81,7 @@ export class SafeContractSuite {
     }
     async getOpHash(chainId, unsignedUserOp) {
         const { factory, factoryData, verificationGasLimit, callGasLimit, maxPriorityFeePerGas, maxFeePerGas, } = unsignedUserOp;
-        const client = await getClient(chainId);
+        const client = await Network.fromChainId(chainId).client;
         const opHash = await client.readContract({
             address: this.m4337.address,
             abi: this.m4337.abi,
@@ -136,7 +137,7 @@ export class SafeContractSuite {
         };
     }
     async getNonce(address, chainId) {
-        const nonce = (await getClient(chainId).readContract({
+        const nonce = (await Network.fromChainId(chainId).client.readContract({
             abi: this.entryPoint.abi,
             address: this.entryPoint.address,
             functionName: "getNonce",
@@ -145,7 +146,7 @@ export class SafeContractSuite {
         return nonce;
     }
     async prevOwner(chainId, safeAddress, owner) {
-        const client = getClient(chainId);
+        const client = Network.fromChainId(chainId).client;
         const currentOwners = await client.readContract({
             address: safeAddress,
             // abi: this.singleton.abi,

package/dist/esm/near-safe.js

@@ -1,11 +1,11 @@
-import { setupAdapter, toPayload, requestRouter as mpcRequestRouter, } from "near-ca";
+import { setupAdapter, toPayload, requestRouter as mpcRequestRouter, Network, } from "near-ca";
 import { zeroAddress } from "viem";
 import { DEFAULT_SAFE_SALT_NONCE } from "./constants";
 import { Erc4337Bundler } from "./lib/bundler";
 import { encodeMulti } from "./lib/multisend";
 import { SafeContractSuite } from "./lib/safe";
 import { decodeSafeMessage } from "./lib/safe-message";
-import { assertUnique, getClient, isContract, metaTransactionsFromRequest, packSignature, } from "./util";
+import { assertUnique, isContract, metaTransactionsFromRequest, packSignature, } from "./util";
 export class NearSafe {
     nearAdapter;
     address;
@@ -70,7 +70,9 @@ export class NearSafe {
      * @returns {Promise<bigint>} - A promise that resolves to the balance of the Safe account in wei.
      */
     async getBalance(chainId) {
-        return await getClient(chainId).getBalance({ address: this.address });
+        return await Network.fromChainId(chainId).client.getBalance({
+            address: this.address,
+        });
     }
     /**
      * Constructs a user operation for the specified chain, including necessary gas fees, nonce, and paymaster data.

package/dist/esm/util.d.ts

@@ -1,5 +1,5 @@
 import { SessionRequestParams } from "near-ca";
-import { Address, Hex, PublicClient } from "viem";
+import { Address, Hex } from "viem";
 import { PaymasterData, MetaTransaction, UserOperation } from "./types";
 export declare const PLACEHOLDER_SIG: `0x${string}`;
 type IntLike = Hex | bigint | string | number;
@@ -8,7 +8,6 @@ export declare function packSignature(signature: `0x${string}`, validFrom?: numb
 export declare function packPaymasterData(data: PaymasterData): Hex;
 export declare function containsValue(transactions: MetaTransaction[]): boolean;
 export declare function isContract(address: Address, chainId: number): Promise<boolean>;
-export declare function getClient(chainId: number, rpcUrl?: string): PublicClient;
 export declare function metaTransactionsFromRequest(params: SessionRequestParams): MetaTransaction[];
 export declare function saltNonceFromMessage(input: string): string;
 /**

package/dist/esm/util.js

@@ -19,12 +19,8 @@ export function containsValue(transactions) {
     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, rpcUrl) {
-    // Caution: rpcUrl might not be aligned with chainId!
-    const options = rpcUrl ? { rpcUrl } : {};
-    return Network.fromChainId(chainId, options).client;
+    return ((await Network.fromChainId(chainId).client.getCode({ address })) !==
+        undefined);
 }
 export function metaTransactionsFromRequest(params) {
     let transactions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",
@@ -37,29 +37,28 @@
     "example": "tsx examples/send-tx.ts",
     "lint": "prettier --check '{src,examples,tests}/**/*.{js,jsx,ts,tsx}' && eslint . --ignore-pattern dist/",
     "fmt": "prettier --write '{src,examples,tests}/**/*.{js,jsx,ts,tsx}' && bun lint --fix",
-    "test": "jest",
     "all": "bun fmt && bun lint && bun build"
   },
   "dependencies": {
     "@safe-global/safe-gateway-typescript-sdk": "^3.23.1",
     "glob": "^11.0.3",
-    "near-api-js": "^6.2.6",
-    "near-ca": "^0.11.1",
+    "near-api-js": "^6.3.0",
+    "near-ca": "0.12.0",
     "semver": "^7.7.2",
-    "viem": "^2.36.0"
+    "viem": "^2.37.8"
   },
   "devDependencies": {
     "@duneanalytics/client-sdk": "^0.2.5",
-    "@safe-global/safe-deployments": "^1.37.42",
-    "@safe-global/safe-modules-deployments": "^2.2.14",
+    "@safe-global/safe-deployments": "^1.37.45",
+    "@safe-global/safe-modules-deployments": "^2.2.16",
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.3.0",
-    "@types/semver": "^7.7.0",
+    "@types/node": "^24.5.2",
+    "@types/semver": "^7.7.1",
     "@types/yargs": "^17.0.33",
-    "@typescript-eslint/eslint-plugin": "^8.41.0",
-    "@typescript-eslint/parser": "^8.41.0",
-    "dotenv": "^17.2.1",
-    "eslint": "^9.34.0",
+    "@typescript-eslint/eslint-plugin": "^8.44.1",
+    "@typescript-eslint/parser": "^8.44.1",
+    "dotenv": "^17.2.2",
+    "eslint": "^9.36.0",
     "eslint-plugin-import": "^2.32.0",
     "prettier": "^3.6.2",
     "tsx": "^4.20.5",