near-safe 0.7.0 → 0.7.1

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

@@ -11,7 +11,7 @@ export declare class SafeContractSuite {
     moduleSetup: Deployment;
     entryPoint: Deployment;
     constructor();
-    addressForSetup(setup: Hex, saltNonce?: string): Promise<Address>;
+    addressForSetup(setup: Hex, saltNonce: string): Promise<Address>;
     getSetup(owners: string[]): Hex;
     addOwnerData(newOwner: Address): Hex;
     getOpHash(chainId: number, unsignedUserOp: UserOperation): Promise<Hash>;

package/dist/cjs/lib/safe.js

@@ -21,7 +21,7 @@ class SafeContractSuite {
     async addressForSetup(setup, saltNonce) {
         // bytes32 salt = keccak256(abi.encodePacked(keccak256(initializer), saltNonce));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L58
-        const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(["bytes32", "uint256"], [(0, viem_1.keccak256)(setup), BigInt(saltNonce || "0")]));
+        const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(["bytes32", "uint256"], [(0, viem_1.keccak256)(setup), BigInt(saltNonce)]));
         // 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"], [
@@ -43,18 +43,18 @@ class SafeContractSuite {
             abi: this.singleton.abi,
             functionName: "setup",
             args: [
-                owners,
-                1, // We use sign threshold of 1.
-                this.moduleSetup.address,
+                owners, // _owners
+                1, // _threshold
+                this.moduleSetup.address, // to
                 (0, viem_1.encodeFunctionData)({
                     abi: this.moduleSetup.abi,
                     functionName: "enableModules",
                     args: [[this.m4337.address]],
-                }),
-                this.m4337.address,
-                viem_1.zeroAddress,
-                0,
-                viem_1.zeroAddress,
+                }), // data
+                this.m4337.address, // fallbackHandler
+                viem_1.zeroAddress, // paymentToken
+                0, // payment
+                viem_1.zeroAddress, // paymentReceiver
             ],
         });
     }

package/dist/cjs/near-safe.js

@@ -18,7 +18,8 @@ class NearSafe {
      * @returns {Promise<NearSafe>} - A promise that resolves to a new `NearSafe` instance.
      */
     static async create(config) {
-        const { pimlicoKey, safeSaltNonce } = config;
+        const { pimlicoKey } = 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();
@@ -30,7 +31,7 @@ class NearSafe {
         MPC EOA: ${nearAdapter.address}
         Safe: ${safeAddress}
     `);
-        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || constants_1.DEFAULT_SAFE_SALT_NONCE);
+        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce);
     }
     /**
      * Constructs a new `NearSafe` object with the provided parameters.

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

@@ -11,7 +11,7 @@ export declare class SafeContractSuite {
     moduleSetup: Deployment;
     entryPoint: Deployment;
     constructor();
-    addressForSetup(setup: Hex, saltNonce?: string): Promise<Address>;
+    addressForSetup(setup: Hex, saltNonce: string): Promise<Address>;
     getSetup(owners: string[]): Hex;
     addOwnerData(newOwner: Address): Hex;
     getOpHash(chainId: number, unsignedUserOp: UserOperation): Promise<Hash>;

package/dist/esm/lib/safe.js

@@ -25,7 +25,7 @@ export class SafeContractSuite {
     async addressForSetup(setup, saltNonce) {
         // bytes32 salt = keccak256(abi.encodePacked(keccak256(initializer), saltNonce));
         // cf: https://github.com/safe-global/safe-smart-account/blob/499b17ad0191b575fcadc5cb5b8e3faeae5391ae/contracts/proxies/SafeProxyFactory.sol#L58
-        const salt = keccak256(encodePacked(["bytes32", "uint256"], [keccak256(setup), BigInt(saltNonce || "0")]));
+        const salt = keccak256(encodePacked(["bytes32", "uint256"], [keccak256(setup), BigInt(saltNonce)]));
         // 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"], [
@@ -47,18 +47,18 @@ export class SafeContractSuite {
             abi: this.singleton.abi,
             functionName: "setup",
             args: [
-                owners,
-                1, // We use sign threshold of 1.
-                this.moduleSetup.address,
+                owners, // _owners
+                1, // _threshold
+                this.moduleSetup.address, // to
                 encodeFunctionData({
                     abi: this.moduleSetup.abi,
                     functionName: "enableModules",
                     args: [[this.m4337.address]],
-                }),
-                this.m4337.address,
-                zeroAddress,
-                0,
-                zeroAddress,
+                }), // data
+                this.m4337.address, // fallbackHandler
+                zeroAddress, // paymentToken
+                0, // payment
+                zeroAddress, // paymentReceiver
             ],
         });
     }

package/dist/esm/near-safe.js

@@ -21,7 +21,8 @@ export class NearSafe {
      * @returns {Promise<NearSafe>} - A promise that resolves to a new `NearSafe` instance.
      */
     static async create(config) {
-        const { pimlicoKey, safeSaltNonce } = config;
+        const { pimlicoKey } = config;
+        const safeSaltNonce = config.safeSaltNonce || DEFAULT_SAFE_SALT_NONCE;
         // const nearAdapter = await mockAdapter();
         const nearAdapter = await setupAdapter({ ...config });
         const safePack = new SafeContractSuite();
@@ -33,7 +34,7 @@ export class NearSafe {
         MPC EOA: ${nearAdapter.address}
         Safe: ${safeAddress}
     `);
-        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce || DEFAULT_SAFE_SALT_NONCE);
+        return new NearSafe(nearAdapter, safePack, pimlicoKey, setup, safeAddress, safeSaltNonce);
     }
     /**
      * Constructs a new `NearSafe` object with the provided parameters.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",