near-safe 0.3.1 → 0.3.2

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

@@ -1,6 +1,6 @@
 import { type SafeInfo } from "@safe-global/safe-gateway-typescript-sdk";
-import { EIP712TypedData, RecoveryData } from "near-ca";
-import { Address, Hash } from "viem";
+import { EIP712TypedData } from "near-ca";
+import { Hash } from "viem";
 export type DecodedSafeMessage = {
     decodedMessage: string | EIP712TypedData;
     safeMessageMessage: string;
@@ -20,8 +20,3 @@ export type MinimalSafeInfo = Pick<SafeInfo, "address" | "version" | "chainId">;
  * }`
  */
 export declare function decodeSafeMessage(message: string | EIP712TypedData, safe: MinimalSafeInfo): DecodedSafeMessage;
-export declare function safeMessageTxData(method: string, message: DecodedSafeMessage, sender: Address): {
-    evmMessage: string;
-    payload: number[];
-    recoveryData: RecoveryData;
-};

package/dist/cjs/lib/safe-message.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeSafeMessage = decodeSafeMessage;
-exports.safeMessageTxData = safeMessageTxData;
-const near_ca_1 = require("near-ca");
 const semver_1 = require("semver");
 const viem_1 = require("viem");
 /*
@@ -84,21 +82,6 @@ function decodeSafeMessage(message, safe) {
         safeMessageHash: generateSafeMessageHash(safe, decodedMessage),
     };
 }
-function safeMessageTxData(method, message, sender) {
-    return {
-        evmMessage: message.safeMessageMessage,
-        payload: (0, near_ca_1.toPayload)(message.safeMessageHash),
-        recoveryData: {
-            type: method,
-            data: {
-                address: sender,
-                // TODO - Upgrade Signable Message in near-ca
-                // @ts-expect-error: Type 'string | EIP712TypedData' is not assignable to type 'SignableMessage'.
-                message: decodedMessage,
-            },
-        },
-    };
-}
 // const isEIP712TypedData = (obj: any): obj is EIP712TypedData => {
 //   return (
 //     typeof obj === "object" &&

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

@@ -1,9 +1,9 @@
 import { FinalExecutionOutcome } from "near-api-js/lib/providers";
-import { NearEthAdapter, SignRequestData, NearEthTxData, RecoveryData } from "near-ca";
+import { NearEthAdapter, SignRequestData } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { Erc4337Bundler } from "./lib/bundler";
 import { ContractSuite } from "./lib/safe";
-import { MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
+import { EncodedTxData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
 export declare class TransactionManager {
     readonly nearAdapter: NearEthAdapter;
     readonly address: Address;
@@ -31,7 +31,7 @@ export declare class TransactionManager {
     }): Promise<UserOperation>;
     signTransaction(safeOpHash: Hex): Promise<Hex>;
     opHash(userOp: UserOperation): Promise<Hash>;
-    encodeSignRequest(signRequest: SignRequestData, usePaymaster: boolean): Promise<NearEthTxData>;
+    encodeSignRequest(signRequest: SignRequestData, usePaymaster: boolean): Promise<EncodedTxData>;
     executeTransaction(chainId: number, userOp: UserOperation): Promise<UserOperationReceipt>;
     safeDeployed(chainId: number): Promise<boolean>;
     addOwnerTx(address: Address): MetaTransaction;
@@ -53,6 +53,6 @@ export declare class TransactionManager {
     requestRouter({ method, chainId, params }: SignRequestData, usePaymaster: boolean): Promise<{
         evmMessage: string;
         payload: number[];
-        recoveryData: RecoveryData;
+        hash: Hash;
     }>;
 }

package/dist/cjs/tx-manager.js

@@ -68,14 +68,18 @@ class TransactionManager {
         return this.safePack.getOpHash(userOp);
     }
     async encodeSignRequest(signRequest, usePaymaster) {
-        const data = await this.requestRouter(signRequest, usePaymaster);
+        const { payload, evmMessage, hash } = await this.requestRouter(signRequest, usePaymaster);
         return {
             nearPayload: await this.nearAdapter.mpcContract.encodeSignatureRequestTx({
                 path: this.nearAdapter.derivationPath,
-                payload: data.payload,
+                payload,
                 key_version: 0,
             }),
-            ...data,
+            evmData: {
+                chainId: signRequest.chainId,
+                data: evmMessage,
+                hash,
+            },
         };
     }
     async executeTransaction(chainId, userOp) {
@@ -152,12 +156,22 @@ class TransactionManager {
             case "eth_signTypedData":
             case "eth_signTypedData_v4":
             case "eth_sign": {
-                const [sender, messageOrData] = params;
-                return (0, safe_message_1.safeMessageTxData)(method, (0, safe_message_1.decodeSafeMessage)(messageOrData, safeInfo), sender);
+                const [_, messageOrData] = params;
+                const message = (0, safe_message_1.decodeSafeMessage)(messageOrData, safeInfo);
+                return {
+                    evmMessage: message.safeMessageMessage,
+                    payload: (0, near_ca_1.toPayload)(message.safeMessageHash),
+                    hash: message.safeMessageHash,
+                };
             }
             case "personal_sign": {
-                const [messageHash, sender] = params;
-                return (0, safe_message_1.safeMessageTxData)(method, (0, safe_message_1.decodeSafeMessage)(messageHash, safeInfo), sender);
+                const [messageHash, _] = params;
+                const message = (0, safe_message_1.decodeSafeMessage)(messageHash, safeInfo);
+                return {
+                    evmMessage: message.safeMessageMessage,
+                    payload: (0, near_ca_1.toPayload)(message.safeMessageHash),
+                    hash: message.safeMessageHash,
+                };
             }
             case "eth_sendTransaction": {
                 const transactions = (0, util_1.metaTransactionsFromRequest)(params);
@@ -170,12 +184,7 @@ class TransactionManager {
                 return {
                     payload: (0, near_ca_1.toPayload)(opHash),
                     evmMessage: JSON.stringify(userOp),
-                    recoveryData: {
-                        type: method,
-                        // TODO: Double check that this is sufficient for UI.
-                        // We may want to adapt and return the `MetaTransactions` instead.
-                        data: opHash,
-                    },
+                    hash: await this.opHash(userOp),
                 };
             }
         }

package/dist/cjs/types.d.ts

@@ -1,4 +1,5 @@
-import { Address, Hex } from "viem";
+import { FunctionCallTransaction, SignArgs } from "near-ca";
+import { Address, Hash, Hex, TransactionSerializable } from "viem";
 export interface UnsignedUserOperation {
     sender: Address;
     nonce: string;
@@ -89,4 +90,14 @@ export interface MetaTransaction {
     readonly data: string;
     readonly operation?: OperationType;
 }
+export interface EncodedTxData {
+    evmData: {
+        chainId: number;
+        data: string | TransactionSerializable;
+        hash: Hash;
+    };
+    nearPayload: FunctionCallTransaction<{
+        request: SignArgs;
+    }>;
+}
 export {};

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

@@ -1,6 +1,6 @@
 import { type SafeInfo } from "@safe-global/safe-gateway-typescript-sdk";
-import { EIP712TypedData, RecoveryData } from "near-ca";
-import { Address, Hash } from "viem";
+import { EIP712TypedData } from "near-ca";
+import { Hash } from "viem";
 export type DecodedSafeMessage = {
     decodedMessage: string | EIP712TypedData;
     safeMessageMessage: string;
@@ -20,8 +20,3 @@ export type MinimalSafeInfo = Pick<SafeInfo, "address" | "version" | "chainId">;
  * }`
  */
 export declare function decodeSafeMessage(message: string | EIP712TypedData, safe: MinimalSafeInfo): DecodedSafeMessage;
-export declare function safeMessageTxData(method: string, message: DecodedSafeMessage, sender: Address): {
-    evmMessage: string;
-    payload: number[];
-    recoveryData: RecoveryData;
-};

package/dist/esm/lib/safe-message.js

@@ -1,4 +1,3 @@
-import { toPayload } from "near-ca";
 import { gte } from "semver";
 import { fromHex, hashMessage, hashTypedData, isHex, } from "viem";
 /*
@@ -80,21 +79,6 @@ export function decodeSafeMessage(message, safe) {
         safeMessageHash: generateSafeMessageHash(safe, decodedMessage),
     };
 }
-export function safeMessageTxData(method, message, sender) {
-    return {
-        evmMessage: message.safeMessageMessage,
-        payload: toPayload(message.safeMessageHash),
-        recoveryData: {
-            type: method,
-            data: {
-                address: sender,
-                // TODO - Upgrade Signable Message in near-ca
-                // @ts-expect-error: Type 'string | EIP712TypedData' is not assignable to type 'SignableMessage'.
-                message: decodedMessage,
-            },
-        },
-    };
-}
 // const isEIP712TypedData = (obj: any): obj is EIP712TypedData => {
 //   return (
 //     typeof obj === "object" &&

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

@@ -1,9 +1,9 @@
 import { FinalExecutionOutcome } from "near-api-js/lib/providers";
-import { NearEthAdapter, SignRequestData, NearEthTxData, RecoveryData } from "near-ca";
+import { NearEthAdapter, SignRequestData } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { Erc4337Bundler } from "./lib/bundler";
 import { ContractSuite } from "./lib/safe";
-import { MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
+import { EncodedTxData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
 export declare class TransactionManager {
     readonly nearAdapter: NearEthAdapter;
     readonly address: Address;
@@ -31,7 +31,7 @@ export declare class TransactionManager {
     }): Promise<UserOperation>;
     signTransaction(safeOpHash: Hex): Promise<Hex>;
     opHash(userOp: UserOperation): Promise<Hash>;
-    encodeSignRequest(signRequest: SignRequestData, usePaymaster: boolean): Promise<NearEthTxData>;
+    encodeSignRequest(signRequest: SignRequestData, usePaymaster: boolean): Promise<EncodedTxData>;
     executeTransaction(chainId: number, userOp: UserOperation): Promise<UserOperationReceipt>;
     safeDeployed(chainId: number): Promise<boolean>;
     addOwnerTx(address: Address): MetaTransaction;
@@ -53,6 +53,6 @@ export declare class TransactionManager {
     requestRouter({ method, chainId, params }: SignRequestData, usePaymaster: boolean): Promise<{
         evmMessage: string;
         payload: number[];
-        recoveryData: RecoveryData;
+        hash: Hash;
     }>;
 }

package/dist/esm/tx-manager.js

@@ -3,7 +3,7 @@ import { serializeSignature } from "viem";
 import { Erc4337Bundler } from "./lib/bundler";
 import { encodeMulti } from "./lib/multisend";
 import { ContractSuite } from "./lib/safe";
-import { decodeSafeMessage, safeMessageTxData } from "./lib/safe-message";
+import { decodeSafeMessage } from "./lib/safe-message";
 import { getClient, isContract, metaTransactionsFromRequest, packSignature, } from "./util";
 export class TransactionManager {
     nearAdapter;
@@ -72,14 +72,18 @@ export class TransactionManager {
         return this.safePack.getOpHash(userOp);
     }
     async encodeSignRequest(signRequest, usePaymaster) {
-        const data = await this.requestRouter(signRequest, usePaymaster);
+        const { payload, evmMessage, hash } = await this.requestRouter(signRequest, usePaymaster);
         return {
             nearPayload: await this.nearAdapter.mpcContract.encodeSignatureRequestTx({
                 path: this.nearAdapter.derivationPath,
-                payload: data.payload,
+                payload,
                 key_version: 0,
             }),
-            ...data,
+            evmData: {
+                chainId: signRequest.chainId,
+                data: evmMessage,
+                hash,
+            },
         };
     }
     async executeTransaction(chainId, userOp) {
@@ -156,12 +160,22 @@ export class TransactionManager {
             case "eth_signTypedData":
             case "eth_signTypedData_v4":
             case "eth_sign": {
-                const [sender, messageOrData] = params;
-                return safeMessageTxData(method, decodeSafeMessage(messageOrData, safeInfo), sender);
+                const [_, messageOrData] = params;
+                const message = decodeSafeMessage(messageOrData, safeInfo);
+                return {
+                    evmMessage: message.safeMessageMessage,
+                    payload: toPayload(message.safeMessageHash),
+                    hash: message.safeMessageHash,
+                };
             }
             case "personal_sign": {
-                const [messageHash, sender] = params;
-                return safeMessageTxData(method, decodeSafeMessage(messageHash, safeInfo), sender);
+                const [messageHash, _] = params;
+                const message = decodeSafeMessage(messageHash, safeInfo);
+                return {
+                    evmMessage: message.safeMessageMessage,
+                    payload: toPayload(message.safeMessageHash),
+                    hash: message.safeMessageHash,
+                };
             }
             case "eth_sendTransaction": {
                 const transactions = metaTransactionsFromRequest(params);
@@ -174,12 +188,7 @@ export class TransactionManager {
                 return {
                     payload: toPayload(opHash),
                     evmMessage: JSON.stringify(userOp),
-                    recoveryData: {
-                        type: method,
-                        // TODO: Double check that this is sufficient for UI.
-                        // We may want to adapt and return the `MetaTransactions` instead.
-                        data: opHash,
-                    },
+                    hash: await this.opHash(userOp),
                 };
             }
         }

package/dist/esm/types.d.ts

@@ -1,4 +1,5 @@
-import { Address, Hex } from "viem";
+import { FunctionCallTransaction, SignArgs } from "near-ca";
+import { Address, Hash, Hex, TransactionSerializable } from "viem";
 export interface UnsignedUserOperation {
     sender: Address;
     nonce: string;
@@ -89,4 +90,14 @@ export interface MetaTransaction {
     readonly data: string;
     readonly operation?: OperationType;
 }
+export interface EncodedTxData {
+    evmData: {
+        chainId: number;
+        data: string | TransactionSerializable;
+        hash: Hash;
+    };
+    nearPayload: FunctionCallTransaction<{
+        request: SignArgs;
+    }>;
+}
 export {};

package/package.json

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