near-safe 0.8.2 → 0.8.4

package/dist/cjs/decode/index.d.ts

@@ -0,0 +1,8 @@
+import { DecodedTxData, SafeEncodedSignRequest } from "../types";
+/**
+ * Decodes transaction data for a given EVM transaction and extracts relevant details.
+ *
+ * @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, }: Omit<SafeEncodedSignRequest, "hashToSign">): DecodedTxData;

package/dist/cjs/decode/index.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeTxData = decodeTxData;
+const safe_message_1 = require("../lib/safe-message");
+const util_1 = require("./util");
+/**
+ * Decodes transaction data for a given EVM transaction and extracts relevant details.
+ *
+ * @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.
+ */
+function decodeTxData({ evmMessage, chainId, }) {
+    const data = evmMessage;
+    if ((0, safe_message_1.isRlpHex)(evmMessage)) {
+        return (0, util_1.decodeRlpHex)(chainId, evmMessage);
+    }
+    if ((0, safe_message_1.isTransactionSerializable)(data)) {
+        return (0, util_1.decodeTransactionSerializable)(chainId, data);
+    }
+    if (typeof data !== "string") {
+        return (0, util_1.decodeTypedData)(chainId, data);
+    }
+    try {
+        // Stringified UserOperation.
+        const userOp = JSON.parse(data);
+        return (0, util_1.decodeUserOperation)(chainId, userOp);
+    }
+    catch (error) {
+        if (error instanceof SyntaxError) {
+            // Raw message string.
+            return {
+                chainId,
+                costEstimate: "0",
+                transactions: [],
+                message: data,
+            };
+        }
+        else {
+            // 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 (0, util_1.decodeTypedData)(chainId, typedData);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                throw new Error(`decodeTxData: Unexpected error - ${message}`);
+            }
+        }
+    }
+}

package/dist/cjs/decode/util.d.ts

@@ -0,0 +1,7 @@
+import { EIP712TypedData } from "near-ca";
+import { Hex, TransactionSerializable } from "viem";
+import { DecodedTxData, UserOperation } from "../types";
+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;
+export declare function decodeUserOperation(chainId: number, userOp: UserOperation): DecodedTxData;

package/dist/cjs/{decode.js → decode/util.js}

@@ -1,62 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeTxData = decodeTxData;
 exports.decodeTransactionSerializable = decodeTransactionSerializable;
 exports.decodeRlpHex = decodeRlpHex;
 exports.decodeTypedData = decodeTypedData;
 exports.decodeUserOperation = decodeUserOperation;
 const ethers_multisend_1 = require("ethers-multisend");
 const viem_1 = require("viem");
-const deployments_1 = require("./_gen/deployments");
-const multisend_1 = require("./lib/multisend");
-const safe_message_1 = require("./lib/safe-message");
-/**
- * Decodes transaction data for a given EVM transaction and extracts relevant details.
- *
- * @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.
- */
-function decodeTxData({ evmMessage, chainId, }) {
-    const data = evmMessage;
-    if ((0, safe_message_1.isRlpHex)(evmMessage)) {
-        return decodeRlpHex(chainId, evmMessage);
-    }
-    if ((0, safe_message_1.isTransactionSerializable)(data)) {
-        return decodeTransactionSerializable(chainId, data);
-    }
-    if (typeof data !== "string") {
-        return decodeTypedData(chainId, data);
-    }
-    try {
-        // Stringified UserOperation.
-        const userOp = JSON.parse(data);
-        return decodeUserOperation(chainId, userOp);
-    }
-    catch (error) {
-        if (error instanceof SyntaxError) {
-            // Raw message string.
-            return {
-                chainId,
-                costEstimate: "0",
-                transactions: [],
-                message: data,
-            };
-        }
-        else {
-            // 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}`);
-            }
-        }
-    }
-}
+const deployments_1 = require("../_gen/deployments");
+const multisend_1 = require("../lib/multisend");
 function decodeTransactionSerializable(chainId, tx) {
     const { gas, maxFeePerGas, maxPriorityFeePerGas, to } = tx;
     if (chainId !== tx.chainId) {

package/dist/cjs/index.d.ts

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

package/dist/cjs/index.js

@@ -14,12 +14,14 @@ 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.mpcRequestRouter = exports.signatureFromTxHash = exports.signatureFromOutcome = exports.populateTx = exports.Network = void 0;
+exports.mpcRequestRouter = exports.signatureFromTxHash = exports.signatureFromOutcome = exports.populateTx = exports.Network = exports.decodeTxData = void 0;
 __exportStar(require("./near-safe"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./util"), exports);
 __exportStar(require("./constants"), exports);
-__exportStar(require("./decode"), exports);
+var decode_1 = require("./decode");
+Object.defineProperty(exports, "decodeTxData", { enumerable: true, get: function () { return decode_1.decodeTxData; } });
+__exportStar(require("./lib/safe-message"), 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; } });

package/dist/cjs/near-safe.js

@@ -337,13 +337,15 @@ class NearSafe {
         }
     }
     encodeForSafe(from) {
-        const fromLower = from.toLowerCase();
-        if (![this.address, this.mpcAddress]
-            .map((t) => t.toLowerCase())
-            .includes(fromLower)) {
+        const lowerFrom = from.toLowerCase();
+        const lowerZero = viem_1.zeroAddress.toLowerCase();
+        const lowerSafe = this.address.toLowerCase();
+        const lowerMpc = this.mpcAddress.toLowerCase();
+        // We allow zeroAddress (and and treat is as from = safe)
+        if (![lowerSafe, lowerMpc, lowerZero].includes(lowerFrom)) {
             throw new Error(`Unexpected from address ${from}`);
         }
-        return this.address.toLowerCase() === fromLower;
+        return [this.address.toLowerCase(), lowerZero].includes(lowerFrom);
     }
     async policyForChainId(chainId) {
         const bundler = this.bundlerForChainId(chainId);

package/dist/esm/decode/index.d.ts

@@ -0,0 +1,8 @@
+import { DecodedTxData, SafeEncodedSignRequest } from "../types";
+/**
+ * Decodes transaction data for a given EVM transaction and extracts relevant details.
+ *
+ * @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, }: Omit<SafeEncodedSignRequest, "hashToSign">): DecodedTxData;

package/dist/esm/decode/index.js

@@ -0,0 +1,49 @@
+import { isRlpHex, isTransactionSerializable } from "../lib/safe-message";
+import { decodeRlpHex, decodeTransactionSerializable, decodeTypedData, decodeUserOperation, } from "./util";
+/**
+ * Decodes transaction data for a given EVM transaction and extracts relevant details.
+ *
+ * @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 function decodeTxData({ evmMessage, chainId, }) {
+    const data = evmMessage;
+    if (isRlpHex(evmMessage)) {
+        return decodeRlpHex(chainId, evmMessage);
+    }
+    if (isTransactionSerializable(data)) {
+        return decodeTransactionSerializable(chainId, data);
+    }
+    if (typeof data !== "string") {
+        return decodeTypedData(chainId, data);
+    }
+    try {
+        // Stringified UserOperation.
+        const userOp = JSON.parse(data);
+        return decodeUserOperation(chainId, userOp);
+    }
+    catch (error) {
+        if (error instanceof SyntaxError) {
+            // Raw message string.
+            return {
+                chainId,
+                costEstimate: "0",
+                transactions: [],
+                message: data,
+            };
+        }
+        else {
+            // 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/decode/util.d.ts

@@ -0,0 +1,7 @@
+import { EIP712TypedData } from "near-ca";
+import { Hex, TransactionSerializable } from "viem";
+import { DecodedTxData, UserOperation } from "../types";
+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;
+export declare function decodeUserOperation(chainId: number, userOp: UserOperation): DecodedTxData;

package/dist/esm/{decode.js → decode/util.js}

@@ -1,55 +1,7 @@
 import { decodeMulti } from "ethers-multisend";
 import { decodeFunctionData, formatEther, parseTransaction, serializeTransaction, } from "viem";
-import { SAFE_DEPLOYMENTS } from "./_gen/deployments";
-import { isMultisendTx } from "./lib/multisend";
-import { isRlpHex, isTransactionSerializable } from "./lib/safe-message";
-/**
- * Decodes transaction data for a given EVM transaction and extracts relevant details.
- *
- * @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 function decodeTxData({ evmMessage, chainId, }) {
-    const data = evmMessage;
-    if (isRlpHex(evmMessage)) {
-        return decodeRlpHex(chainId, evmMessage);
-    }
-    if (isTransactionSerializable(data)) {
-        return decodeTransactionSerializable(chainId, data);
-    }
-    if (typeof data !== "string") {
-        return decodeTypedData(chainId, data);
-    }
-    try {
-        // Stringified UserOperation.
-        const userOp = JSON.parse(data);
-        return decodeUserOperation(chainId, userOp);
-    }
-    catch (error) {
-        if (error instanceof SyntaxError) {
-            // Raw message string.
-            return {
-                chainId,
-                costEstimate: "0",
-                transactions: [],
-                message: data,
-            };
-        }
-        else {
-            // 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}`);
-            }
-        }
-    }
-}
+import { SAFE_DEPLOYMENTS } from "../_gen/deployments";
+import { isMultisendTx } from "../lib/multisend";
 export function decodeTransactionSerializable(chainId, tx) {
     const { gas, maxFeePerGas, maxPriorityFeePerGas, to } = tx;
     if (chainId !== tx.chainId) {

package/dist/esm/index.d.ts

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

package/dist/esm/index.js

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

package/dist/esm/near-safe.js

@@ -1,5 +1,5 @@
 import { setupAdapter, signatureFromOutcome, toPayload, requestRouter as mpcRequestRouter, } from "near-ca";
-import { serializeSignature } from "viem";
+import { serializeSignature, zeroAddress } from "viem";
 import { DEFAULT_SAFE_SALT_NONCE } from "./constants";
 import { Erc4337Bundler } from "./lib/bundler";
 import { encodeMulti } from "./lib/multisend";
@@ -340,13 +340,15 @@ export class NearSafe {
         }
     }
     encodeForSafe(from) {
-        const fromLower = from.toLowerCase();
-        if (![this.address, this.mpcAddress]
-            .map((t) => t.toLowerCase())
-            .includes(fromLower)) {
+        const lowerFrom = from.toLowerCase();
+        const lowerZero = zeroAddress.toLowerCase();
+        const lowerSafe = this.address.toLowerCase();
+        const lowerMpc = this.mpcAddress.toLowerCase();
+        // We allow zeroAddress (and and treat is as from = safe)
+        if (![lowerSafe, lowerMpc, lowerZero].includes(lowerFrom)) {
             throw new Error(`Unexpected from address ${from}`);
         }
-        return this.address.toLowerCase() === fromLower;
+        return [this.address.toLowerCase(), lowerZero].includes(lowerFrom);
     }
     async policyForChainId(chainId) {
         const bundler = this.bundlerForChainId(chainId);

package/package.json

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

package/dist/cjs/decode.d.ts

@@ -1,14 +0,0 @@
-import { EIP712TypedData } from "near-ca";
-import { Hex, TransactionSerializable } from "viem";
-import { DecodedTxData, SafeEncodedSignRequest, UserOperation } from "./types";
-/**
- * Decodes transaction data for a given EVM transaction and extracts relevant details.
- *
- * @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, }: 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;
-export declare function decodeUserOperation(chainId: number, userOp: UserOperation): DecodedTxData;

package/dist/esm/decode.d.ts

@@ -1,14 +0,0 @@
-import { EIP712TypedData } from "near-ca";
-import { Hex, TransactionSerializable } from "viem";
-import { DecodedTxData, SafeEncodedSignRequest, UserOperation } from "./types";
-/**
- * Decodes transaction data for a given EVM transaction and extracts relevant details.
- *
- * @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, }: 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;
-export declare function decodeUserOperation(chainId: number, userOp: UserOperation): DecodedTxData;