near-safe 0.8.1 → 0.8.3

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);

package/dist/cjs/index.d.ts

@@ -3,4 +3,5 @@ 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 * from "./lib/safe-message";
+export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, requestRouter as mpcRequestRouter, EthTransactionParams, } from "near-ca";

package/dist/cjs/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./util"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./decode"), exports);
+__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.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);

package/dist/esm/index.d.ts

@@ -3,4 +3,5 @@ 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 * from "./lib/safe-message";
+export { Network, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, requestRouter as mpcRequestRouter, EthTransactionParams, } from "near-ca";

package/dist/esm/index.js

@@ -3,4 +3,5 @@ export * from "./types";
 export * from "./util";
 export * from "./constants";
 export * 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.1",
+  "version": "0.8.3",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",