near-safe 0.7.2 → 0.7.4

package/dist/cjs/lib/safe.js

@@ -110,7 +110,7 @@ class SafeContractSuite {
                     abi: this.m4337.abi,
                     functionName: "executeUserOp",
                     args: [
-                        txData.to,
+                        (0, viem_1.getAddress)(txData.to),
                         BigInt(txData.value),
                         txData.data,
                         txData.operation || 0,

package/dist/cjs/near-safe.d.ts

@@ -160,7 +160,7 @@ export declare class NearSafe {
      * Decodes transaction data for a given EVM transaction and extracts relevant details.
      *
      * @param {EvmTransactionData} data - The raw transaction data to be decoded.
-     * @returns {{ chainId: number; costEstimate: string; transactions: MetaTransaction[] }} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
+     * @returns {DecodedMultisend} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
      */
     decodeTxData(data: EvmTransactionData): DecodedMultisend;
     /**

package/dist/cjs/near-safe.js

@@ -244,34 +244,49 @@ class NearSafe {
      * Decodes transaction data for a given EVM transaction and extracts relevant details.
      *
      * @param {EvmTransactionData} data - The raw transaction data to be decoded.
-     * @returns {{ chainId: number; costEstimate: string; transactions: MetaTransaction[] }} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
+     * @returns {DecodedMultisend} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
      */
     decodeTxData(data) {
-        // TODO: data.data may not always parse to UserOperation. We will have to handle the other cases.
-        const userOp = JSON.parse(data.data);
-        const { callGasLimit, maxFeePerGas, maxPriorityFeePerGas } = userOp;
-        const maxGasPrice = BigInt(maxFeePerGas) + BigInt(maxPriorityFeePerGas);
-        const { args } = (0, viem_1.decodeFunctionData)({
-            abi: this.safePack.m4337.abi,
-            data: userOp.callData,
-        });
-        // Determine if singular or double!
-        const transactions = (0, multisend_1.isMultisendTx)(args)
-            ? (0, ethers_multisend_1.decodeMulti)(args[2])
-            : [
-                {
-                    to: args[0],
-                    value: args[1],
-                    data: args[2],
-                    operation: args[3],
-                },
-            ];
-        return {
-            chainId: data.chainId,
-            // This is an upper bound on the gas fees (could be lower)
-            costEstimate: (0, viem_1.formatEther)(BigInt(callGasLimit) * maxGasPrice),
-            transactions,
-        };
+        try {
+            const userOp = JSON.parse(data.data);
+            const { callGasLimit, maxFeePerGas, maxPriorityFeePerGas } = userOp;
+            const maxGasPrice = BigInt(maxFeePerGas) + BigInt(maxPriorityFeePerGas);
+            const { args } = (0, viem_1.decodeFunctionData)({
+                abi: this.safePack.m4337.abi,
+                data: userOp.callData,
+            });
+            // Determine if singular or double!
+            const transactions = (0, multisend_1.isMultisendTx)(args)
+                ? (0, ethers_multisend_1.decodeMulti)(args[2])
+                : [
+                    {
+                        to: args[0],
+                        value: args[1],
+                        data: args[2],
+                        operation: args[3],
+                    },
+                ];
+            return {
+                chainId: data.chainId,
+                // This is an upper bound on the gas fees (could be lower)
+                costEstimate: (0, viem_1.formatEther)(BigInt(callGasLimit) * maxGasPrice),
+                transactions,
+            };
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                return {
+                    chainId: data.chainId,
+                    costEstimate: "0",
+                    transactions: [],
+                    message: data.data,
+                };
+            }
+            else {
+                const message = error instanceof Error ? error.message : String(error);
+                throw new Error(`decodeTxData: Unexpected error - ${message}`);
+            }
+        }
     }
     /**
      * Handles routing of signature requests based on the provided method, chain ID, and parameters.
@@ -308,7 +323,8 @@ class NearSafe {
                 const [messageHash, _] = params;
                 const message = (0, safe_message_1.decodeSafeMessage)(messageHash, safeInfo);
                 return {
-                    evmMessage: message.safeMessageMessage,
+                    // TODO(bh2smith) this is a bit of a hack.
+                    evmMessage: message.decodedMessage,
                     payload: (0, near_ca_1.toPayload)(message.safeMessageHash),
                     hash: message.safeMessageHash,
                 };

package/dist/cjs/types.d.ts

@@ -234,6 +234,8 @@ export interface DecodedMultisend {
     costEstimate: string;
     /** The list of meta-transactions included in the multisend. */
     transactions: MetaTransaction[];
+    /** Raw Message to sign if no transactions present. */
+    message?: string;
 }
 /**
  * Represents encoded transaction data for both NEAR and EVM networks.

package/dist/esm/lib/safe.js

@@ -1,4 +1,4 @@
-import { concat, encodeFunctionData, encodePacked, getCreate2Address, keccak256, toHex, zeroAddress, } from "viem";
+import { concat, encodeFunctionData, encodePacked, getAddress, getCreate2Address, keccak256, toHex, zeroAddress, } from "viem";
 import { SAFE_DEPLOYMENTS } from "../_gen/deployments";
 import { USER_OP_IDENTIFIER } from "../constants";
 import { PLACEHOLDER_SIG, getClient, packGas, packPaymasterData, } from "../util";
@@ -114,7 +114,7 @@ export class SafeContractSuite {
                     abi: this.m4337.abi,
                     functionName: "executeUserOp",
                     args: [
-                        txData.to,
+                        getAddress(txData.to),
                         BigInt(txData.value),
                         txData.data,
                         txData.operation || 0,

package/dist/esm/near-safe.d.ts

@@ -160,7 +160,7 @@ export declare class NearSafe {
      * Decodes transaction data for a given EVM transaction and extracts relevant details.
      *
      * @param {EvmTransactionData} data - The raw transaction data to be decoded.
-     * @returns {{ chainId: number; costEstimate: string; transactions: MetaTransaction[] }} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
+     * @returns {DecodedMultisend} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
      */
     decodeTxData(data: EvmTransactionData): DecodedMultisend;
     /**

package/dist/esm/near-safe.js

@@ -247,34 +247,49 @@ export class NearSafe {
      * Decodes transaction data for a given EVM transaction and extracts relevant details.
      *
      * @param {EvmTransactionData} data - The raw transaction data to be decoded.
-     * @returns {{ chainId: number; costEstimate: string; transactions: MetaTransaction[] }} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
+     * @returns {DecodedMultisend} - An object containing the chain ID, estimated cost, and a list of decoded meta-transactions.
      */
     decodeTxData(data) {
-        // TODO: data.data may not always parse to UserOperation. We will have to handle the other cases.
-        const userOp = JSON.parse(data.data);
-        const { callGasLimit, maxFeePerGas, maxPriorityFeePerGas } = userOp;
-        const maxGasPrice = BigInt(maxFeePerGas) + BigInt(maxPriorityFeePerGas);
-        const { args } = decodeFunctionData({
-            abi: this.safePack.m4337.abi,
-            data: userOp.callData,
-        });
-        // Determine if singular or double!
-        const transactions = isMultisendTx(args)
-            ? decodeMulti(args[2])
-            : [
-                {
-                    to: args[0],
-                    value: args[1],
-                    data: args[2],
-                    operation: args[3],
-                },
-            ];
-        return {
-            chainId: data.chainId,
-            // This is an upper bound on the gas fees (could be lower)
-            costEstimate: formatEther(BigInt(callGasLimit) * maxGasPrice),
-            transactions,
-        };
+        try {
+            const userOp = JSON.parse(data.data);
+            const { callGasLimit, maxFeePerGas, maxPriorityFeePerGas } = userOp;
+            const maxGasPrice = BigInt(maxFeePerGas) + BigInt(maxPriorityFeePerGas);
+            const { args } = decodeFunctionData({
+                abi: this.safePack.m4337.abi,
+                data: userOp.callData,
+            });
+            // Determine if singular or double!
+            const transactions = isMultisendTx(args)
+                ? decodeMulti(args[2])
+                : [
+                    {
+                        to: args[0],
+                        value: args[1],
+                        data: args[2],
+                        operation: args[3],
+                    },
+                ];
+            return {
+                chainId: data.chainId,
+                // This is an upper bound on the gas fees (could be lower)
+                costEstimate: formatEther(BigInt(callGasLimit) * maxGasPrice),
+                transactions,
+            };
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                return {
+                    chainId: data.chainId,
+                    costEstimate: "0",
+                    transactions: [],
+                    message: data.data,
+                };
+            }
+            else {
+                const message = error instanceof Error ? error.message : String(error);
+                throw new Error(`decodeTxData: Unexpected error - ${message}`);
+            }
+        }
     }
     /**
      * Handles routing of signature requests based on the provided method, chain ID, and parameters.
@@ -311,7 +326,8 @@ export class NearSafe {
                 const [messageHash, _] = params;
                 const message = decodeSafeMessage(messageHash, safeInfo);
                 return {
-                    evmMessage: message.safeMessageMessage,
+                    // TODO(bh2smith) this is a bit of a hack.
+                    evmMessage: message.decodedMessage,
                     payload: toPayload(message.safeMessageHash),
                     hash: message.safeMessageHash,
                 };

package/dist/esm/types.d.ts

@@ -234,6 +234,8 @@ export interface DecodedMultisend {
     costEstimate: string;
     /** The list of meta-transactions included in the multisend. */
     transactions: MetaTransaction[];
+    /** Raw Message to sign if no transactions present. */
+    message?: string;
 }
 /**
  * Represents encoded transaction data for both NEAR and EVM networks.

package/package.json

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