near-safe 0.8.0 → 0.8.2

package/dist/cjs/decode.d.ts

@@ -7,7 +7,7 @@ import { DecodedTxData, SafeEncodedSignRequest, UserOperation } from "./types";
  * @param {EvmTransactionData} data - The raw transaction data to be decoded.
  * @returns {DecodedTxData} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
  */
-export declare function decodeTxData({ evmMessage, chainId, }: SafeEncodedSignRequest): DecodedTxData;
+export declare function decodeTxData({ evmMessage, chainId, }: Omit<SafeEncodedSignRequest, "hashToSign">): DecodedTxData;
 export declare function decodeTransactionSerializable(chainId: number, tx: TransactionSerializable): DecodedTxData;
 export declare function decodeRlpHex(chainId: number, tx: Hex): DecodedTxData;
 export declare function decodeTypedData(chainId: number, data: EIP712TypedData): DecodedTxData;

package/dist/cjs/decode.js

@@ -19,7 +19,7 @@ const safe_message_1 = require("./lib/safe-message");
 function decodeTxData({ evmMessage, chainId, }) {
     const data = evmMessage;
     if ((0, safe_message_1.isRlpHex)(evmMessage)) {
-        decodeRlpHex(chainId, evmMessage);
+        return decodeRlpHex(chainId, evmMessage);
     }
     if ((0, safe_message_1.isTransactionSerializable)(data)) {
         return decodeTransactionSerializable(chainId, data);
@@ -43,8 +43,17 @@ function decodeTxData({ evmMessage, chainId, }) {
             };
         }
         else {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`decodeTxData: Unexpected error - ${message}`);
+            // TODO: This shouldn't happen anymore and can probably be reverted.
+            // We keep it here now, because near-ca might not have adapted its router.
+            console.warn("Failed UserOp Parsing, try TypedData Parsing", error);
+            try {
+                const typedData = JSON.parse(data);
+                return decodeTypedData(chainId, typedData);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                throw new Error(`decodeTxData: Unexpected error - ${message}`);
+            }
         }
     }
 }

package/dist/cjs/index.d.ts

@@ -2,4 +2,5 @@ export * from "./near-safe";
 export * from "./types";
 export * from "./util";
 export * from "./constants";
-export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, } from "near-ca";
+export * from "./decode";
+export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, requestRouter as mpcRequestRouter, } from "near-ca";

package/dist/cjs/index.js

@@ -14,13 +14,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signatureFromTxHash = exports.signatureFromOutcome = exports.populateTx = exports.Network = void 0;
+exports.mpcRequestRouter = exports.signatureFromTxHash = exports.signatureFromOutcome = exports.populateTx = exports.Network = void 0;
 __exportStar(require("./near-safe"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./util"), exports);
 __exportStar(require("./constants"), exports);
+__exportStar(require("./decode"), 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; } });
 Object.defineProperty(exports, "signatureFromOutcome", { enumerable: true, get: function () { return near_ca_1.signatureFromOutcome; } });
 Object.defineProperty(exports, "signatureFromTxHash", { enumerable: true, get: function () { return near_ca_1.signatureFromTxHash; } });
+Object.defineProperty(exports, "mpcRequestRouter", { enumerable: true, get: function () { return near_ca_1.requestRouter; } });

package/dist/cjs/near-safe.js

@@ -283,6 +283,7 @@ class NearSafe {
         (0, util_1.assertUnique)(fromAddresses);
         // Early return with eoaEncoding if `from` is not the Safe
         if (!this.encodeForSafe(fromAddresses[0])) {
+            // TODO: near-ca needs to update this for typed data like we did.
             return (0, near_ca_1.requestRouter)({ method, chainId, params });
         }
         const safeInfo = {
@@ -295,7 +296,14 @@ class NearSafe {
         // We should either confirm they agree or ignore one of the two.
         switch (method) {
             case "eth_signTypedData":
-            case "eth_signTypedData_v4":
+            case "eth_signTypedData_v4": {
+                const [_, typedDataString] = params;
+                const message = (0, safe_message_1.decodeSafeMessage)(JSON.parse(typedDataString), safeInfo);
+                return {
+                    evmMessage: JSON.parse(typedDataString),
+                    hashToSign: message.safeMessageHash,
+                };
+            }
             case "eth_sign": {
                 const [_, messageOrData] = params;
                 const message = (0, safe_message_1.decodeSafeMessage)(messageOrData, safeInfo);

package/dist/esm/decode.d.ts

@@ -7,7 +7,7 @@ import { DecodedTxData, SafeEncodedSignRequest, UserOperation } from "./types";
  * @param {EvmTransactionData} data - The raw transaction data to be decoded.
  * @returns {DecodedTxData} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
  */
-export declare function decodeTxData({ evmMessage, chainId, }: SafeEncodedSignRequest): DecodedTxData;
+export declare function decodeTxData({ evmMessage, chainId, }: Omit<SafeEncodedSignRequest, "hashToSign">): DecodedTxData;
 export declare function decodeTransactionSerializable(chainId: number, tx: TransactionSerializable): DecodedTxData;
 export declare function decodeRlpHex(chainId: number, tx: Hex): DecodedTxData;
 export declare function decodeTypedData(chainId: number, data: EIP712TypedData): DecodedTxData;

package/dist/esm/decode.js

@@ -12,7 +12,7 @@ import { isRlpHex, isTransactionSerializable } from "./lib/safe-message";
 export function decodeTxData({ evmMessage, chainId, }) {
     const data = evmMessage;
     if (isRlpHex(evmMessage)) {
-        decodeRlpHex(chainId, evmMessage);
+        return decodeRlpHex(chainId, evmMessage);
     }
     if (isTransactionSerializable(data)) {
         return decodeTransactionSerializable(chainId, data);
@@ -36,8 +36,17 @@ export function decodeTxData({ evmMessage, chainId, }) {
             };
         }
         else {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`decodeTxData: Unexpected error - ${message}`);
+            // TODO: This shouldn't happen anymore and can probably be reverted.
+            // We keep it here now, because near-ca might not have adapted its router.
+            console.warn("Failed UserOp Parsing, try TypedData Parsing", error);
+            try {
+                const typedData = JSON.parse(data);
+                return decodeTypedData(chainId, typedData);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                throw new Error(`decodeTxData: Unexpected error - ${message}`);
+            }
         }
     }
 }

package/dist/esm/index.d.ts

@@ -2,4 +2,5 @@ export * from "./near-safe";
 export * from "./types";
 export * from "./util";
 export * from "./constants";
-export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, } from "near-ca";
+export * from "./decode";
+export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, requestRouter as mpcRequestRouter, } from "near-ca";

package/dist/esm/index.js

@@ -2,4 +2,5 @@ export * from "./near-safe";
 export * from "./types";
 export * from "./util";
 export * from "./constants";
-export { Network, populateTx, signatureFromOutcome, signatureFromTxHash, } from "near-ca";
+export * from "./decode";
+export { Network, populateTx, signatureFromOutcome, signatureFromTxHash, requestRouter as mpcRequestRouter, } from "near-ca";

package/dist/esm/near-safe.js

@@ -286,6 +286,7 @@ export class NearSafe {
         assertUnique(fromAddresses);
         // Early return with eoaEncoding if `from` is not the Safe
         if (!this.encodeForSafe(fromAddresses[0])) {
+            // TODO: near-ca needs to update this for typed data like we did.
             return mpcRequestRouter({ method, chainId, params });
         }
         const safeInfo = {
@@ -298,7 +299,14 @@ export class NearSafe {
         // We should either confirm they agree or ignore one of the two.
         switch (method) {
             case "eth_signTypedData":
-            case "eth_signTypedData_v4":
+            case "eth_signTypedData_v4": {
+                const [_, typedDataString] = params;
+                const message = decodeSafeMessage(JSON.parse(typedDataString), safeInfo);
+                return {
+                    evmMessage: JSON.parse(typedDataString),
+                    hashToSign: message.safeMessageHash,
+                };
+            }
             case "eth_sign": {
                 const [_, messageOrData] = params;
                 const message = decodeSafeMessage(messageOrData, safeInfo);

package/package.json

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