near-safe 0.8.5 → 0.8.7

package/dist/cjs/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const USER_OP_IDENTIFIER: `0x${string}`;
 export declare const DEFAULT_SAFE_SALT_NONCE: string;
 export declare const SENTINEL_OWNERS = "0x0000000000000000000000000000000000000001";
+export declare const DEFAULT_SETUP_RPC = "https://ethereum-sepolia-rpc.publicnode.com";

package/dist/cjs/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SENTINEL_OWNERS = exports.DEFAULT_SAFE_SALT_NONCE = exports.USER_OP_IDENTIFIER = void 0;
+exports.DEFAULT_SETUP_RPC = exports.SENTINEL_OWNERS = exports.DEFAULT_SAFE_SALT_NONCE = exports.USER_OP_IDENTIFIER = void 0;
 const viem_1 = require("viem");
 const DOMAIN_SEPARATOR = "bitte/near-safe";
 // 0x62697474652f6e6561722d7361666500
@@ -8,3 +8,4 @@ exports.USER_OP_IDENTIFIER = (0, viem_1.toHex)(DOMAIN_SEPARATOR, { size: 16 });
 // 130811896738364114529934864114944206080
 exports.DEFAULT_SAFE_SALT_NONCE = BigInt(exports.USER_OP_IDENTIFIER).toString();
 exports.SENTINEL_OWNERS = "0x0000000000000000000000000000000000000001";
+exports.DEFAULT_SETUP_RPC = "https://ethereum-sepolia-rpc.publicnode.com";

package/dist/cjs/lib/safe.d.ts

@@ -4,13 +4,13 @@ import { Deployment, GasPrice, MetaTransaction, UnsignedUserOperation, UserOpera
  * All contracts used in account creation & execution
  */
 export declare class SafeContractSuite {
-    dummyClient: PublicClient;
+    setupClient: PublicClient;
     singleton: Deployment;
     proxyFactory: Deployment;
     m4337: Deployment;
     moduleSetup: Deployment;
     entryPoint: Deployment;
-    constructor();
+    constructor(rpcUrl?: string);
     addressForSetup(setup: Hex, saltNonce: string): Promise<Address>;
     getSetup(owners: string[]): Hex;
     addOwnerData(newOwner: Address): Hex;

package/dist/cjs/lib/safe.js

@@ -9,8 +9,8 @@ const util_1 = require("../util");
  * All contracts used in account creation & execution
  */
 class SafeContractSuite {
-    constructor() {
-        this.dummyClient = (0, util_1.getClient)(11155111);
+    constructor(rpcUrl = constants_1.DEFAULT_SETUP_RPC) {
+        this.setupClient = (0, viem_1.createPublicClient)({ transport: (0, viem_1.http)(rpcUrl) });
         const deployments = deployments_1.SAFE_DEPLOYMENTS;
         this.singleton = deployments.singleton;
         this.proxyFactory = deployments.proxyFactory;
@@ -25,7 +25,7 @@ class SafeContractSuite {
         // abi.encodePacked(type(SafeProxy).creationCode, uint256(uint160(_singleton)));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L29
         const initCode = (0, viem_1.encodePacked)(["bytes", "uint256"], [
-            (await this.dummyClient.readContract({
+            (await this.setupClient.readContract({
                 address: this.proxyFactory.address,
                 abi: this.proxyFactory.abi,
                 functionName: "proxyCreationCode",

package/dist/cjs/near-safe.d.ts

@@ -1,15 +1,12 @@
-import { NearConfig } from "near-api-js/lib/near";
-import { NearEthAdapter, SignRequestData, EncodedSignRequest } from "near-ca";
+import { NearEthAdapter, SignRequestData, EncodedSignRequest, SetupConfig as MpcConfig } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { SafeContractSuite } from "./lib/safe";
 import { EncodedTxData, MetaTransaction, SponsorshipPolicyData, UserOperation, UserOperationReceipt } from "./types";
 export interface NearSafeConfig {
-    accountId: string;
-    mpcContractId: string;
-    nearConfig?: NearConfig;
-    privateKey?: string;
+    mpc: MpcConfig;
     pimlicoKey: string;
     safeSaltNonce?: string;
+    setupRpc?: string;
 }
 export declare class NearSafe {
     readonly nearAdapter: NearEthAdapter;

package/dist/cjs/near-safe.js

@@ -17,11 +17,11 @@ class NearSafe {
      * @returns {Promise<NearSafe>} - A promise that resolves to a new `NearSafe` instance.
      */
     static async create(config) {
-        const { pimlicoKey } = config;
+        const { pimlicoKey, setupRpc } = config;
         const safeSaltNonce = config.safeSaltNonce || constants_1.DEFAULT_SAFE_SALT_NONCE;
         // const nearAdapter = await mockAdapter();
-        const nearAdapter = await (0, near_ca_1.setupAdapter)({ ...config });
-        const safePack = new safe_1.SafeContractSuite();
+        const nearAdapter = await (0, near_ca_1.setupAdapter)(config.mpc);
+        const safePack = new safe_1.SafeContractSuite(setupRpc);
         const setup = safePack.getSetup([nearAdapter.address]);
         const safeAddress = await safePack.addressForSetup(setup, safeSaltNonce);
         console.log(`

package/dist/cjs/util.js

@@ -13,6 +13,7 @@ exports.raceToFirstResolve = raceToFirstResolve;
 exports.assertUnique = assertUnique;
 const near_ca_1 = require("near-ca");
 const viem_1 = require("viem");
+const constants_1 = require("./constants");
 exports.PLACEHOLDER_SIG = (0, viem_1.encodePacked)(["uint48", "uint48"], [0, 0]);
 const packGas = (hi, lo) => (0, viem_1.encodePacked)(["uint128", "uint128"], [BigInt(hi), BigInt(lo)]);
 exports.packGas = packGas;
@@ -36,6 +37,10 @@ async function isContract(address, chainId) {
     return (await getClient(chainId).getCode({ address })) !== undefined;
 }
 function getClient(chainId) {
+    // TODO(bh2smith)
+    if (chainId === 11155111) {
+        return (0, viem_1.createPublicClient)({ transport: (0, viem_1.http)(constants_1.DEFAULT_SETUP_RPC) });
+    }
     return near_ca_1.Network.fromChainId(chainId).client;
 }
 function metaTransactionsFromRequest(params) {

package/dist/esm/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const USER_OP_IDENTIFIER: `0x${string}`;
 export declare const DEFAULT_SAFE_SALT_NONCE: string;
 export declare const SENTINEL_OWNERS = "0x0000000000000000000000000000000000000001";
+export declare const DEFAULT_SETUP_RPC = "https://ethereum-sepolia-rpc.publicnode.com";

package/dist/esm/constants.js

@@ -5,3 +5,4 @@ export const USER_OP_IDENTIFIER = toHex(DOMAIN_SEPARATOR, { size: 16 });
 // 130811896738364114529934864114944206080
 export const DEFAULT_SAFE_SALT_NONCE = BigInt(USER_OP_IDENTIFIER).toString();
 export const SENTINEL_OWNERS = "0x0000000000000000000000000000000000000001";
+export const DEFAULT_SETUP_RPC = "https://ethereum-sepolia-rpc.publicnode.com";

package/dist/esm/lib/safe.d.ts

@@ -4,13 +4,13 @@ import { Deployment, GasPrice, MetaTransaction, UnsignedUserOperation, UserOpera
  * All contracts used in account creation & execution
  */
 export declare class SafeContractSuite {
-    dummyClient: PublicClient;
+    setupClient: PublicClient;
     singleton: Deployment;
     proxyFactory: Deployment;
     m4337: Deployment;
     moduleSetup: Deployment;
     entryPoint: Deployment;
-    constructor();
+    constructor(rpcUrl?: string);
     addressForSetup(setup: Hex, saltNonce: string): Promise<Address>;
     getSetup(owners: string[]): Hex;
     addOwnerData(newOwner: Address): Hex;

package/dist/esm/lib/safe.js

@@ -1,20 +1,20 @@
-import { concat, encodeFunctionData, encodePacked, getAddress, getCreate2Address, keccak256, parseAbi, toHex, zeroAddress, } from "viem";
+import { concat, createPublicClient, encodeFunctionData, encodePacked, getAddress, getCreate2Address, http, keccak256, parseAbi, toHex, zeroAddress, } from "viem";
 import { SAFE_DEPLOYMENTS } from "../_gen/deployments";
-import { SENTINEL_OWNERS, USER_OP_IDENTIFIER } from "../constants";
+import { DEFAULT_SETUP_RPC, SENTINEL_OWNERS, USER_OP_IDENTIFIER, } from "../constants";
 import { PLACEHOLDER_SIG, getClient, packGas, packPaymasterData, } from "../util";
 /**
  * All contracts used in account creation & execution
  */
 export class SafeContractSuite {
     // Used only for stateless contract reads.
-    dummyClient;
+    setupClient;
     singleton;
     proxyFactory;
     m4337;
     moduleSetup;
     entryPoint;
-    constructor() {
-        this.dummyClient = getClient(11155111);
+    constructor(rpcUrl = DEFAULT_SETUP_RPC) {
+        this.setupClient = createPublicClient({ transport: http(rpcUrl) });
         const deployments = SAFE_DEPLOYMENTS;
         this.singleton = deployments.singleton;
         this.proxyFactory = deployments.proxyFactory;
@@ -29,7 +29,7 @@ export class SafeContractSuite {
         // abi.encodePacked(type(SafeProxy).creationCode, uint256(uint160(_singleton)));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L29
         const initCode = encodePacked(["bytes", "uint256"], [
-            (await this.dummyClient.readContract({
+            (await this.setupClient.readContract({
                 address: this.proxyFactory.address,
                 abi: this.proxyFactory.abi,
                 functionName: "proxyCreationCode",

package/dist/esm/near-safe.d.ts

@@ -1,15 +1,12 @@
-import { NearConfig } from "near-api-js/lib/near";
-import { NearEthAdapter, SignRequestData, EncodedSignRequest } from "near-ca";
+import { NearEthAdapter, SignRequestData, EncodedSignRequest, SetupConfig as MpcConfig } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { SafeContractSuite } from "./lib/safe";
 import { EncodedTxData, MetaTransaction, SponsorshipPolicyData, UserOperation, UserOperationReceipt } from "./types";
 export interface NearSafeConfig {
-    accountId: string;
-    mpcContractId: string;
-    nearConfig?: NearConfig;
-    privateKey?: string;
+    mpc: MpcConfig;
     pimlicoKey: string;
     safeSaltNonce?: string;
+    setupRpc?: string;
 }
 export declare class NearSafe {
     readonly nearAdapter: NearEthAdapter;

package/dist/esm/near-safe.js

@@ -20,11 +20,11 @@ export class NearSafe {
      * @returns {Promise<NearSafe>} - A promise that resolves to a new `NearSafe` instance.
      */
     static async create(config) {
-        const { pimlicoKey } = config;
+        const { pimlicoKey, setupRpc } = config;
         const safeSaltNonce = config.safeSaltNonce || DEFAULT_SAFE_SALT_NONCE;
         // const nearAdapter = await mockAdapter();
-        const nearAdapter = await setupAdapter({ ...config });
-        const safePack = new SafeContractSuite();
+        const nearAdapter = await setupAdapter(config.mpc);
+        const safePack = new SafeContractSuite(setupRpc);
         const setup = safePack.getSetup([nearAdapter.address]);
         const safeAddress = await safePack.addressForSetup(setup, safeSaltNonce);
         console.log(`

package/dist/esm/util.js

@@ -1,5 +1,6 @@
 import { getNetworkId, Network, signatureFromTxHash as sigFromHash, } from "near-ca";
-import { concatHex, encodePacked, toHex, isHex, parseTransaction, zeroAddress, toBytes, keccak256, serializeSignature, } from "viem";
+import { concatHex, encodePacked, toHex, isHex, parseTransaction, zeroAddress, toBytes, keccak256, serializeSignature, createPublicClient, http, } from "viem";
+import { DEFAULT_SETUP_RPC } from "./constants";
 export const PLACEHOLDER_SIG = encodePacked(["uint48", "uint48"], [0, 0]);
 export const packGas = (hi, lo) => encodePacked(["uint128", "uint128"], [BigInt(hi), BigInt(lo)]);
 export function packSignature(signature, validFrom = 0, validTo = 0) {
@@ -22,6 +23,10 @@ export async function isContract(address, chainId) {
     return (await getClient(chainId).getCode({ address })) !== undefined;
 }
 export function getClient(chainId) {
+    // TODO(bh2smith)
+    if (chainId === 11155111) {
+        return createPublicClient({ transport: http(DEFAULT_SETUP_RPC) });
+    }
     return Network.fromChainId(chainId).client;
 }
 export function metaTransactionsFromRequest(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",
@@ -35,7 +35,7 @@
     "build:deployments": "tsx scripts/safe-deployments.ts && prettier --write 'src/_gen/**/*.ts'",
     "start": "yarn example",
     "example": "tsx examples/send-tx.ts",
-    "lint": "eslint . --ignore-pattern dist/",
+    "lint": "prettier --check '{src,examples,tests}/**/*.{js,jsx,ts,tsx}' && eslint . --ignore-pattern dist/",
     "fmt": "prettier --write '{src,examples,tests}/**/*.{js,jsx,ts,tsx}' && yarn lint --fix",
     "test": "jest",
     "all": "yarn fmt && yarn lint && yarn build"
@@ -45,7 +45,7 @@
     "near-api-js": "^5.0.0",
     "near-ca": "^0.6.0",
     "semver": "^7.6.3",
-    "viem": "^2.16.5"
+    "viem": "^2.21.41"
   },
   "devDependencies": {
     "@safe-global/safe-deployments": "^1.37.0",