near-safe 0.0.4 → 0.0.5

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

@@ -1,5 +1,5 @@
 import { ethers } from "ethers";
-import { NearEthAdapter, NearEthTxData } from "near-ca";
+import { NearEthAdapter, NearEthTxData, BaseTx } from "near-ca";
 import { Erc4337Bundler } from "./lib/bundler";
 import { UserOperation, UserOperationReceipt } from "./types";
 import { MetaTransaction } from "ethers-multisend";
@@ -31,7 +31,7 @@ export declare class TransactionManager {
     }): Promise<UserOperation>;
     signTransaction(safeOpHash: string): Promise<string>;
     opHash(userOp: UserOperation): Promise<string>;
-    encodeSignatureRequest(unsignedUserOp: UserOperation): Promise<NearEthTxData>;
+    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

@@ -65,16 +65,27 @@ class TransactionManager {
     async opHash(userOp) {
         return this.safePack.getOpHash(userOp);
     }
-    async encodeSignatureRequest(unsignedUserOp) {
+    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 txData = this.nearAdapter.encodeSignRequest({
+        const signRequest = await this.nearAdapter.encodeSignRequest({
             method: "hash",
             chainId: 0,
             params: safeOpHash,
         });
         return {
-            ...txData,
-            evmMessage: unsignedUserOp,
+            ...signRequest,
+            evmMessage: JSON.stringify(unsignedUserOp),
         };
     }
     async executeTransaction(userOp) {

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

@@ -1,5 +1,5 @@
 import { ethers } from "ethers";
-import { NearEthAdapter, NearEthTxData } from "near-ca";
+import { NearEthAdapter, NearEthTxData, BaseTx } from "near-ca";
 import { Erc4337Bundler } from "./lib/bundler";
 import { UserOperation, UserOperationReceipt } from "./types";
 import { MetaTransaction } from "ethers-multisend";
@@ -31,7 +31,7 @@ export declare class TransactionManager {
     }): Promise<UserOperation>;
     signTransaction(safeOpHash: string): Promise<string>;
     opHash(userOp: UserOperation): Promise<string>;
-    encodeSignatureRequest(unsignedUserOp: UserOperation): Promise<NearEthTxData>;
+    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

@@ -70,16 +70,27 @@ export class TransactionManager {
     async opHash(userOp) {
         return this.safePack.getOpHash(userOp);
     }
-    async encodeSignatureRequest(unsignedUserOp) {
+    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 txData = this.nearAdapter.encodeSignRequest({
+        const signRequest = await this.nearAdapter.encodeSignRequest({
             method: "hash",
             chainId: 0,
             params: safeOpHash,
         });
         return {
-            ...txData,
-            evmMessage: unsignedUserOp,
+            ...signRequest,
+            evmMessage: JSON.stringify(unsignedUserOp),
         };
     }
     async executeTransaction(userOp) {

package/package.json

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