near-safe 0.6.1 → 0.6.2

package/dist/cjs/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const USER_OP_IDENTIFIER: `0x${string}`;
+export declare const DEFAULT_SAFE_SALT_NONCE: string;

package/dist/cjs/constants.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_SAFE_SALT_NONCE = exports.USER_OP_IDENTIFIER = void 0;
+const viem_1 = require("viem");
+const DOMAIN_SEPARATOR = "bitte/near-safe";
+// 0x62697474652f6e6561722d7361666500
+exports.USER_OP_IDENTIFIER = (0, viem_1.toHex)(DOMAIN_SEPARATOR, { size: 16 });
+// 130811896738364114529934864114944206080
+exports.DEFAULT_SAFE_SALT_NONCE = BigInt(exports.USER_OP_IDENTIFIER).toString();

package/dist/cjs/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./near-safe";
 export * from "./types";
 export * from "./util";
+export * from "./constants";
 export { Network, BaseTx, SignRequestData, populateTx } from "near-ca";

package/dist/cjs/index.js

@@ -18,6 +18,7 @@ exports.populateTx = exports.Network = void 0;
 __exportStar(require("./near-safe"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./util"), exports);
+__exportStar(require("./constants"), exports);
 var near_ca_1 = require("near-ca");
 Object.defineProperty(exports, "Network", { enumerable: true, get: function () { return near_ca_1.Network; } });
 Object.defineProperty(exports, "populateTx", { enumerable: true, get: function () { return near_ca_1.populateTx; } });

package/dist/cjs/lib/safe.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SafeContractSuite = void 0;
 const viem_1 = require("viem");
 const deployments_1 = require("../_gen/deployments");
+const constants_1 = require("../constants");
 const util_1 = require("../util");
 /**
  * All contracts used in account creation & execution
@@ -104,16 +105,20 @@ class SafeContractSuite {
             nonce: (0, viem_1.toHex)(nonce),
             ...this.factoryDataForSetup(safeNotDeployed, setup, safeSaltNonce),
             // <https://github.com/safe-global/safe-modules/blob/9a18245f546bf2a8ed9bdc2b04aae44f949ec7a0/modules/4337/contracts/Safe4337Module.sol#L172>
-            callData: (0, viem_1.encodeFunctionData)({
-                abi: this.m4337.abi,
-                functionName: "executeUserOp",
-                args: [
-                    txData.to,
-                    BigInt(txData.value),
-                    txData.data,
-                    txData.operation || 0,
-                ],
-            }),
+            callData: (0, viem_1.concat)([
+                (0, viem_1.encodeFunctionData)({
+                    abi: this.m4337.abi,
+                    functionName: "executeUserOp",
+                    args: [
+                        txData.to,
+                        BigInt(txData.value),
+                        txData.data,
+                        txData.operation || 0,
+                    ],
+                }),
+                // Append On-Chain Identifier:
+                constants_1.USER_OP_IDENTIFIER,
+            ]),
             ...feeData,
         };
     }

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

@@ -7,9 +7,9 @@ import { DecodedMultisend, EncodedTxData, EvmTransactionData, MetaTransaction, U
 export interface NearSafeConfig {
     accountId: string;
     mpcContractId: string;
-    pimlicoKey: string;
     nearConfig?: NearConfig;
     privateKey?: string;
+    pimlicoKey: string;
     safeSaltNonce?: string;
 }
 export declare class NearSafe {

package/dist/cjs/near-safe.js

@@ -4,6 +4,7 @@ exports.NearSafe = void 0;
 const ethers_multisend_1 = require("ethers-multisend");
 const near_ca_1 = require("near-ca");
 const viem_1 = require("viem");
+const constants_1 = require("./constants");
 const bundler_1 = require("./lib/bundler");
 const multisend_1 = require("./lib/multisend");
 const safe_1 = require("./lib/safe");
@@ -18,6 +19,7 @@ class NearSafe {
      */
     static async create(config) {
         const { pimlicoKey, safeSaltNonce } = config;
+        // const nearAdapter = await mockAdapter();
         const nearAdapter = await (0, near_ca_1.setupAdapter)({ ...config });
         const safePack = new safe_1.SafeContractSuite();
         const setup = safePack.getSetup([nearAdapter.address]);
@@ -28,7 +30,7 @@ class NearSafe {
         MPC EOA: ${nearAdapter.address}
         Safe: ${safeAddress}
     `);
-        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || "0");
+        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || constants_1.DEFAULT_SAFE_SALT_NONCE);
     }
     /**
      * Constructs a new `NearSafe` object with the provided parameters.
@@ -62,7 +64,7 @@ class NearSafe {
      * @returns {string} - The contract ID of the MPC contract.
      */
     get mpcContractId() {
-        return this.nearAdapter.mpcContract.contract.contractId;
+        return this.nearAdapter.mpcContract.accountId();
     }
     /**
      * Retrieves the balance of the Safe account on the specified EVM chain.
@@ -89,6 +91,7 @@ class NearSafe {
         if (transactions.length === 0) {
             throw new Error("Empty transaction set!");
         }
+        console.log(`Building UserOp on chainId ${chainId} with ${transactions.length} transaction(s)`);
         const bundler = this.bundlerForChainId(chainId);
         const [gasFees, nonce, safeDeployed] = await Promise.all([
             bundler.getGasPrice(),

package/dist/cjs/util.d.ts

@@ -10,4 +10,5 @@ export declare function containsValue(transactions: MetaTransaction[]): boolean;
 export declare function isContract(address: Address, chainId: number): Promise<boolean>;
 export declare function getClient(chainId: number): PublicClient;
 export declare function metaTransactionsFromRequest(params: SessionRequestParams): MetaTransaction[];
+export declare function saltNonceFromMessage(input: string): string;
 export {};

package/dist/cjs/util.js

@@ -7,6 +7,7 @@ exports.containsValue = containsValue;
 exports.isContract = isContract;
 exports.getClient = getClient;
 exports.metaTransactionsFromRequest = metaTransactionsFromRequest;
+exports.saltNonceFromMessage = saltNonceFromMessage;
 const near_ca_1 = require("near-ca");
 const viem_1 = require("viem");
 //
@@ -58,3 +59,10 @@ function metaTransactionsFromRequest(params) {
         data: tx.data || "0x",
     }));
 }
+function saltNonceFromMessage(input) {
+    // Convert the string to bytes (UTF-8 encoding)
+    // Compute the keccak256 hash of the input bytes
+    // Convert the resulting hash (which is in hex) to a BigInt
+    // Return string for readability and transport.
+    return BigInt((0, viem_1.keccak256)((0, viem_1.toBytes)(input))).toString();
+}

package/dist/esm/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const USER_OP_IDENTIFIER: `0x${string}`;
+export declare const DEFAULT_SAFE_SALT_NONCE: string;

package/dist/esm/constants.js

@@ -0,0 +1,6 @@
+import { toHex } from "viem";
+const DOMAIN_SEPARATOR = "bitte/near-safe";
+// 0x62697474652f6e6561722d7361666500
+export const USER_OP_IDENTIFIER = toHex(DOMAIN_SEPARATOR, { size: 16 });
+// 130811896738364114529934864114944206080
+export const DEFAULT_SAFE_SALT_NONCE = BigInt(USER_OP_IDENTIFIER).toString();

package/dist/esm/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./near-safe";
 export * from "./types";
 export * from "./util";
+export * from "./constants";
 export { Network, BaseTx, SignRequestData, populateTx } from "near-ca";

package/dist/esm/index.js

@@ -1,4 +1,5 @@
 export * from "./near-safe";
 export * from "./types";
 export * from "./util";
+export * from "./constants";
 export { Network, populateTx } from "near-ca";

package/dist/esm/lib/safe.js

@@ -1,5 +1,6 @@
-import { encodeFunctionData, encodePacked, getCreate2Address, keccak256, toHex, zeroAddress, } from "viem";
+import { concat, encodeFunctionData, encodePacked, getCreate2Address, keccak256, toHex, zeroAddress, } from "viem";
 import { SAFE_DEPLOYMENTS } from "../_gen/deployments";
+import { USER_OP_IDENTIFIER } from "../constants";
 import { PLACEHOLDER_SIG, getClient, packGas, packPaymasterData, } from "../util";
 /**
  * All contracts used in account creation & execution
@@ -108,16 +109,20 @@ export class SafeContractSuite {
             nonce: toHex(nonce),
             ...this.factoryDataForSetup(safeNotDeployed, setup, safeSaltNonce),
             // <https://github.com/safe-global/safe-modules/blob/9a18245f546bf2a8ed9bdc2b04aae44f949ec7a0/modules/4337/contracts/Safe4337Module.sol#L172>
-            callData: encodeFunctionData({
-                abi: this.m4337.abi,
-                functionName: "executeUserOp",
-                args: [
-                    txData.to,
-                    BigInt(txData.value),
-                    txData.data,
-                    txData.operation || 0,
-                ],
-            }),
+            callData: concat([
+                encodeFunctionData({
+                    abi: this.m4337.abi,
+                    functionName: "executeUserOp",
+                    args: [
+                        txData.to,
+                        BigInt(txData.value),
+                        txData.data,
+                        txData.operation || 0,
+                    ],
+                }),
+                // Append On-Chain Identifier:
+                USER_OP_IDENTIFIER,
+            ]),
             ...feeData,
         };
     }

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

@@ -7,9 +7,9 @@ import { DecodedMultisend, EncodedTxData, EvmTransactionData, MetaTransaction, U
 export interface NearSafeConfig {
     accountId: string;
     mpcContractId: string;
-    pimlicoKey: string;
     nearConfig?: NearConfig;
     privateKey?: string;
+    pimlicoKey: string;
     safeSaltNonce?: string;
 }
 export declare class NearSafe {

package/dist/esm/near-safe.js

@@ -1,6 +1,7 @@
 import { decodeMulti } from "ethers-multisend";
 import { setupAdapter, signatureFromOutcome, toPayload, } from "near-ca";
 import { decodeFunctionData, formatEther, serializeSignature, } from "viem";
+import { DEFAULT_SAFE_SALT_NONCE } from "./constants";
 import { Erc4337Bundler } from "./lib/bundler";
 import { encodeMulti, isMultisendTx } from "./lib/multisend";
 import { SafeContractSuite } from "./lib/safe";
@@ -21,6 +22,7 @@ export class NearSafe {
      */
     static async create(config) {
         const { pimlicoKey, safeSaltNonce } = config;
+        // const nearAdapter = await mockAdapter();
         const nearAdapter = await setupAdapter({ ...config });
         const safePack = new SafeContractSuite();
         const setup = safePack.getSetup([nearAdapter.address]);
@@ -31,7 +33,7 @@ export class NearSafe {
         MPC EOA: ${nearAdapter.address}
         Safe: ${safeAddress}
     `);
-        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || "0");
+        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || DEFAULT_SAFE_SALT_NONCE);
     }
     /**
      * Constructs a new `NearSafe` object with the provided parameters.
@@ -65,7 +67,7 @@ export class NearSafe {
      * @returns {string} - The contract ID of the MPC contract.
      */
     get mpcContractId() {
-        return this.nearAdapter.mpcContract.contract.contractId;
+        return this.nearAdapter.mpcContract.accountId();
     }
     /**
      * Retrieves the balance of the Safe account on the specified EVM chain.
@@ -92,6 +94,7 @@ export class NearSafe {
         if (transactions.length === 0) {
             throw new Error("Empty transaction set!");
         }
+        console.log(`Building UserOp on chainId ${chainId} with ${transactions.length} transaction(s)`);
         const bundler = this.bundlerForChainId(chainId);
         const [gasFees, nonce, safeDeployed] = await Promise.all([
             bundler.getGasPrice(),

package/dist/esm/util.d.ts

@@ -10,4 +10,5 @@ export declare function containsValue(transactions: MetaTransaction[]): boolean;
 export declare function isContract(address: Address, chainId: number): Promise<boolean>;
 export declare function getClient(chainId: number): PublicClient;
 export declare function metaTransactionsFromRequest(params: SessionRequestParams): MetaTransaction[];
+export declare function saltNonceFromMessage(input: string): string;
 export {};

package/dist/esm/util.js

@@ -1,5 +1,5 @@
 import { Network } from "near-ca";
-import { concatHex, encodePacked, toHex, isHex, parseTransaction, zeroAddress, } from "viem";
+import { concatHex, encodePacked, toHex, isHex, parseTransaction, zeroAddress, toBytes, keccak256, } from "viem";
 //
 export const PLACEHOLDER_SIG = encodePacked(["uint48", "uint48"], [0, 0]);
 export const packGas = (hi, lo) => encodePacked(["uint128", "uint128"], [BigInt(hi), BigInt(lo)]);
@@ -48,3 +48,10 @@ export function metaTransactionsFromRequest(params) {
         data: tx.data || "0x",
     }));
 }
+export function saltNonceFromMessage(input) {
+    // Convert the string to bytes (UTF-8 encoding)
+    // Compute the keccak256 hash of the input bytes
+    // Convert the resulting hash (which is in hex) to a BigInt
+    // Return string for readability and transport.
+    return BigInt(keccak256(toBytes(input))).toString();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",
@@ -44,7 +44,7 @@
     "@safe-global/safe-gateway-typescript-sdk": "^3.22.2",
     "ethers-multisend": "^3.1.0",
     "near-api-js": "^5.0.0",
-    "near-ca": "^0.5.7",
+    "near-ca": "^0.5.9",
     "semver": "^7.6.3",
     "viem": "^2.16.5"
   },