near-safe 0.0.3 → 0.0.5

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

@@ -1,5 +1,5 @@
 import { ethers } from "ethers";
-import { GasPrice, PaymasterData, UnsignedUserOperation, UserOperation } from "../types";
+import { GasPrice, UnsignedUserOperation, UserOperation } from "../types";
 import { MetaTransaction } from "ethers-multisend";
 /**
  * All contracts used in account creation & execution
@@ -15,7 +15,7 @@ export declare class ContractSuite {
     static init(provider: ethers.JsonRpcProvider): Promise<ContractSuite>;
     addressForSetup(setup: ethers.BytesLike, saltNonce?: string): Promise<string>;
     getSetup(owners: string[]): Promise<string>;
-    getOpHash(unsignedUserOp: UserOperation, paymasterData: PaymasterData): Promise<string>;
+    getOpHash(unsignedUserOp: UserOperation): Promise<string>;
     factoryDataForSetup(safeNotDeployed: boolean, setup: string, safeSaltNonce: string): {
         factory?: ethers.AddressLike;
         factoryData?: string;

package/dist/cjs/lib/safe.js

@@ -58,7 +58,9 @@ class ContractSuite {
         ]);
         return setup;
     }
-    async getOpHash(unsignedUserOp, paymasterData) {
+    async getOpHash(unsignedUserOp
+    // paymasterData: PaymasterData
+    ) {
         return this.m4337.getOperationHash({
             ...unsignedUserOp,
             initCode: unsignedUserOp.factory
@@ -66,7 +68,7 @@ class ContractSuite {
                 : "0x",
             accountGasLimits: (0, util_1.packGas)(unsignedUserOp.verificationGasLimit, unsignedUserOp.callGasLimit),
             gasFees: (0, util_1.packGas)(unsignedUserOp.maxPriorityFeePerGas, unsignedUserOp.maxFeePerGas),
-            paymasterAndData: (0, util_1.packPaymasterData)(paymasterData),
+            paymasterAndData: (0, util_1.packPaymasterData)(unsignedUserOp),
             signature: util_1.PLACEHOLDER_SIG,
         });
     }

package/dist/cjs/tx-manager.d.ts

@@ -1,7 +1,7 @@
 import { ethers } from "ethers";
-import { NearEthAdapter } from "near-ca";
+import { NearEthAdapter, NearEthTxData, BaseTx } from "near-ca";
 import { Erc4337Bundler } from "./lib/bundler";
-import { UserOperation, UserOperationReceipt, UserOptions } from "./types";
+import { UserOperation, UserOperationReceipt } from "./types";
 import { MetaTransaction } from "ethers-multisend";
 import { ContractSuite } from "./lib/safe";
 import { Account } from "near-api-js";
@@ -27,12 +27,11 @@ export declare class TransactionManager {
     getSafeBalance(): Promise<bigint>;
     buildTransaction(args: {
         transactions: MetaTransaction[];
-        options: UserOptions;
-    }): Promise<{
-        safeOpHash: string;
-        unsignedUserOp: UserOperation;
-    }>;
+        usePaymaster: boolean;
+    }): Promise<UserOperation>;
     signTransaction(safeOpHash: string): Promise<string>;
+    opHash(userOp: UserOperation): Promise<string>;
+    encodeSignRequest(tx: BaseTx): Promise<NearEthTxData>;
     executeTransaction(userOp: UserOperation): Promise<UserOperationReceipt>;
     addOwnerTx(address: string): MetaTransaction;
     safeSufficientlyFunded(transactions: MetaTransaction[], gasCost: bigint): Promise<boolean>;

package/dist/cjs/tx-manager.js

@@ -45,7 +45,7 @@ class TransactionManager {
         return await this.provider.getBalance(this.safeAddress);
     }
     async buildTransaction(args) {
-        const { transactions, options } = args;
+        const { transactions, usePaymaster } = args;
         const gasFees = (await this.bundler.getGasPrice()).fast;
         // const gasFees = await this.provider.getFeeData();
         // Build Singular MetaTransaction for Multisend from transaction list.
@@ -54,18 +54,40 @@ class TransactionManager {
         }
         const tx = transactions.length > 1 ? (0, ethers_multisend_1.encodeMulti)(transactions) : transactions[0];
         const rawUserOp = await this.safePack.buildUserOp(tx, this.safeAddress, gasFees, this.setup, this.safeNotDeployed, this.safeSaltNonce);
-        const paymasterData = await this.bundler.getPaymasterData(rawUserOp, options.usePaymaster, this.safeNotDeployed);
+        const paymasterData = await this.bundler.getPaymasterData(rawUserOp, usePaymaster, this.safeNotDeployed);
         const unsignedUserOp = { ...rawUserOp, ...paymasterData };
-        const safeOpHash = await this.safePack.getOpHash(unsignedUserOp, paymasterData);
-        return {
-            safeOpHash,
-            unsignedUserOp,
-        };
+        return unsignedUserOp;
     }
     async signTransaction(safeOpHash) {
         const signature = await (0, near_1.getNearSignature)(this.nearAdapter, safeOpHash);
         return (0, util_1.packSignature)(signature);
     }
+    async opHash(userOp) {
+        return this.safePack.getOpHash(userOp);
+    }
+    async encodeSignRequest(tx) {
+        // TODO - This is sloppy and ignores ChainId!
+        const unsignedUserOp = await this.buildTransaction({
+            transactions: [
+                {
+                    to: tx.to,
+                    value: (tx.value || 0n).toString(),
+                    data: tx.data || "0x",
+                },
+            ],
+            usePaymaster: true,
+        });
+        const safeOpHash = (await this.opHash(unsignedUserOp));
+        const signRequest = await this.nearAdapter.encodeSignRequest({
+            method: "hash",
+            chainId: 0,
+            params: safeOpHash,
+        });
+        return {
+            ...signRequest,
+            evmMessage: JSON.stringify(unsignedUserOp),
+        };
+    }
     async executeTransaction(userOp) {
         const userOpHash = await this.bundler.sendUserOperation(userOp);
         console.log("UserOp Hash", userOpHash);

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

@@ -1,5 +1,5 @@
 import { ethers } from "ethers";
-import { GasPrice, PaymasterData, UnsignedUserOperation, UserOperation } from "../types";
+import { GasPrice, UnsignedUserOperation, UserOperation } from "../types";
 import { MetaTransaction } from "ethers-multisend";
 /**
  * All contracts used in account creation & execution
@@ -15,7 +15,7 @@ export declare class ContractSuite {
     static init(provider: ethers.JsonRpcProvider): Promise<ContractSuite>;
     addressForSetup(setup: ethers.BytesLike, saltNonce?: string): Promise<string>;
     getSetup(owners: string[]): Promise<string>;
-    getOpHash(unsignedUserOp: UserOperation, paymasterData: PaymasterData): Promise<string>;
+    getOpHash(unsignedUserOp: UserOperation): Promise<string>;
     factoryDataForSetup(safeNotDeployed: boolean, setup: string, safeSaltNonce: string): {
         factory?: ethers.AddressLike;
         factoryData?: string;

package/dist/esm/lib/safe.js

@@ -61,7 +61,9 @@ export class ContractSuite {
         ]);
         return setup;
     }
-    async getOpHash(unsignedUserOp, paymasterData) {
+    async getOpHash(unsignedUserOp
+    // paymasterData: PaymasterData
+    ) {
         return this.m4337.getOperationHash({
             ...unsignedUserOp,
             initCode: unsignedUserOp.factory
@@ -69,7 +71,7 @@ export class ContractSuite {
                 : "0x",
             accountGasLimits: packGas(unsignedUserOp.verificationGasLimit, unsignedUserOp.callGasLimit),
             gasFees: packGas(unsignedUserOp.maxPriorityFeePerGas, unsignedUserOp.maxFeePerGas),
-            paymasterAndData: packPaymasterData(paymasterData),
+            paymasterAndData: packPaymasterData(unsignedUserOp),
             signature: PLACEHOLDER_SIG,
         });
     }

package/dist/esm/tx-manager.d.ts

@@ -1,7 +1,7 @@
 import { ethers } from "ethers";
-import { NearEthAdapter } from "near-ca";
+import { NearEthAdapter, NearEthTxData, BaseTx } from "near-ca";
 import { Erc4337Bundler } from "./lib/bundler";
-import { UserOperation, UserOperationReceipt, UserOptions } from "./types";
+import { UserOperation, UserOperationReceipt } from "./types";
 import { MetaTransaction } from "ethers-multisend";
 import { ContractSuite } from "./lib/safe";
 import { Account } from "near-api-js";
@@ -27,12 +27,11 @@ export declare class TransactionManager {
     getSafeBalance(): Promise<bigint>;
     buildTransaction(args: {
         transactions: MetaTransaction[];
-        options: UserOptions;
-    }): Promise<{
-        safeOpHash: string;
-        unsignedUserOp: UserOperation;
-    }>;
+        usePaymaster: boolean;
+    }): Promise<UserOperation>;
     signTransaction(safeOpHash: string): Promise<string>;
+    opHash(userOp: UserOperation): Promise<string>;
+    encodeSignRequest(tx: BaseTx): Promise<NearEthTxData>;
     executeTransaction(userOp: UserOperation): Promise<UserOperationReceipt>;
     addOwnerTx(address: string): MetaTransaction;
     safeSufficientlyFunded(transactions: MetaTransaction[], gasCost: bigint): Promise<boolean>;

package/dist/esm/tx-manager.js

@@ -50,7 +50,7 @@ export class TransactionManager {
         return await this.provider.getBalance(this.safeAddress);
     }
     async buildTransaction(args) {
-        const { transactions, options } = args;
+        const { transactions, usePaymaster } = args;
         const gasFees = (await this.bundler.getGasPrice()).fast;
         // const gasFees = await this.provider.getFeeData();
         // Build Singular MetaTransaction for Multisend from transaction list.
@@ -59,18 +59,40 @@ export class TransactionManager {
         }
         const tx = transactions.length > 1 ? encodeMulti(transactions) : transactions[0];
         const rawUserOp = await this.safePack.buildUserOp(tx, this.safeAddress, gasFees, this.setup, this.safeNotDeployed, this.safeSaltNonce);
-        const paymasterData = await this.bundler.getPaymasterData(rawUserOp, options.usePaymaster, this.safeNotDeployed);
+        const paymasterData = await this.bundler.getPaymasterData(rawUserOp, usePaymaster, this.safeNotDeployed);
         const unsignedUserOp = { ...rawUserOp, ...paymasterData };
-        const safeOpHash = await this.safePack.getOpHash(unsignedUserOp, paymasterData);
-        return {
-            safeOpHash,
-            unsignedUserOp,
-        };
+        return unsignedUserOp;
     }
     async signTransaction(safeOpHash) {
         const signature = await getNearSignature(this.nearAdapter, safeOpHash);
         return packSignature(signature);
     }
+    async opHash(userOp) {
+        return this.safePack.getOpHash(userOp);
+    }
+    async encodeSignRequest(tx) {
+        // TODO - This is sloppy and ignores ChainId!
+        const unsignedUserOp = await this.buildTransaction({
+            transactions: [
+                {
+                    to: tx.to,
+                    value: (tx.value || 0n).toString(),
+                    data: tx.data || "0x",
+                },
+            ],
+            usePaymaster: true,
+        });
+        const safeOpHash = (await this.opHash(unsignedUserOp));
+        const signRequest = await this.nearAdapter.encodeSignRequest({
+            method: "hash",
+            chainId: 0,
+            params: safeOpHash,
+        });
+        return {
+            ...signRequest,
+            evmMessage: JSON.stringify(unsignedUserOp),
+        };
+    }
     async executeTransaction(userOp) {
         const userOpHash = await this.bundler.sendUserOperation(userOp);
         console.log("UserOp Hash", userOpHash);

package/package.json

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