near-safe 0.8.3 → 0.8.5-beta.0

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,17 @@
+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;
+export declare enum OperationType {
+    Call = 0,
+    DelegateCall = 1
+}
+export interface MetaTransaction {
+    readonly to: string;
+    readonly value: string;
+    readonly data: string;
+    readonly operation?: OperationType;
+}

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 decodeMulti_1 = require("ethers-multisend/build/cjs/decodeMulti");
 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) {
@@ -101,7 +52,7 @@ function decodeUserOperation(chainId, userOp) {
     });
     // Determine if singular or double!
     const transactions = (0, multisend_1.isMultisendTx)(args)
-        ? (0, ethers_multisend_1.decodeMulti)(args[2])
+        ? (0, decodeMulti_1.decodeMulti)(args[2])
         : [
             {
                 to: args[0],

package/dist/cjs/index.d.ts

@@ -2,6 +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, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, requestRouter as mpcRequestRouter, EthTransactionParams, } from "near-ca";

package/dist/cjs/index.js

@@ -14,12 +14,13 @@ 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; } });

package/dist/cjs/lib/multisend.d.ts

@@ -1,4 +1,6 @@
+import { Hex } from "viem";
 import { MetaTransaction } from "../types";
 export declare const MULTI_SEND_ABI: string[];
 export declare function encodeMulti(transactions: readonly MetaTransaction[], multiSendContractAddress?: string): MetaTransaction;
 export declare function isMultisendTx(args: readonly unknown[]): boolean;
+export declare function decodeMultiViem(data: Hex): MetaTransaction[];

package/dist/cjs/lib/multisend.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MULTI_SEND_ABI = void 0;
 exports.encodeMulti = encodeMulti;
 exports.isMultisendTx = isMultisendTx;
+exports.decodeMultiViem = decodeMultiViem;
 const viem_1 = require("viem");
 const types_1 = require("../types");
 exports.MULTI_SEND_ABI = ["function multiSend(bytes memory transactions)"];
@@ -44,3 +45,47 @@ function isMultisendTx(args) {
     return (to === MULTISEND_141.toLowerCase() ||
         to === MULTISEND_CALLONLY_141.toLowerCase());
 }
+// import { Interface } from '@ethersproject/abi';
+// import { getAddress } from '@ethersproject/address';
+// import { BigNumber } from '@ethersproject/bignumber';
+function unpack(packed, startIndex) {
+    // read operation from first 8 bits (= 2 hex digits)
+    const operation = parseInt(packed.substring(startIndex, startIndex + 2), 16);
+    // the next 40 characters are the to address
+    const to = (0, viem_1.getAddress)(`0x${packed.substring(startIndex + 2, startIndex + 42)}`);
+    // then comes the uint256 value (= 64 hex digits)
+    const value = (0, viem_1.toHex)(BigInt(`0x${packed.substring(startIndex + 42, startIndex + 106)}`));
+    // and the uint256 data length (= 64 hex digits)
+    const hexDataLength = parseInt(packed.substring(startIndex + 106, startIndex + 170), 16);
+    const endIndex = startIndex + 170 + hexDataLength * 2; // * 2 because each hex item is represented with 2 digits
+    const data = `0x${packed.substring(startIndex + 170, endIndex)}`;
+    return {
+        operation,
+        to,
+        value,
+        data,
+        endIndex,
+    };
+}
+function decodeMultiViem(data) {
+    // const multiSendContract = new Interface(MULTI_SEND_ABI);
+    // const tx = multiSendContract.parseTransaction({ data });
+    // const multiSendAbiItem = parseAbiItem({
+    //   type: "function",
+    //   name: "multiSend",
+    //   inputs: [{ name: "data", type: "bytes" }],
+    // });
+    const tx = (0, viem_1.decodeFunctionData)({
+        abi: exports.MULTI_SEND_ABI,
+        data,
+    });
+    const [transactionsEncoded] = tx.args;
+    const result = [];
+    let startIndex = 2; // skip over 0x
+    while (startIndex < transactionsEncoded.length) {
+        const { endIndex, ...tx } = unpack(transactionsEncoded, startIndex);
+        result.push(tx);
+        startIndex = endIndex;
+    }
+    return result;
+}

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,17 @@
+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;
+export declare enum OperationType {
+    Call = 0,
+    DelegateCall = 1
+}
+export interface MetaTransaction {
+    readonly to: string;
+    readonly value: string;
+    readonly data: string;
+    readonly operation?: OperationType;
+}

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

@@ -1,55 +1,7 @@
-import { decodeMulti } from "ethers-multisend";
+import { decodeMulti } from "ethers-multisend/build/cjs/decodeMulti";
 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,6 +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, BaseTx, SignRequestData, populateTx, NetworkFields, signatureFromOutcome, signatureFromTxHash, requestRouter as mpcRequestRouter, EthTransactionParams, } from "near-ca";

package/dist/esm/index.js

@@ -2,6 +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/lib/multisend.d.ts

@@ -1,4 +1,6 @@
+import { Hex } from "viem";
 import { MetaTransaction } from "../types";
 export declare const MULTI_SEND_ABI: string[];
 export declare function encodeMulti(transactions: readonly MetaTransaction[], multiSendContractAddress?: string): MetaTransaction;
 export declare function isMultisendTx(args: readonly unknown[]): boolean;
+export declare function decodeMultiViem(data: Hex): MetaTransaction[];

package/dist/esm/lib/multisend.js

@@ -1,4 +1,4 @@
-import { encodeFunctionData, encodePacked, parseAbi, size, } from "viem";
+import { decodeFunctionData, encodeFunctionData, encodePacked, getAddress, parseAbi, size, toHex, } from "viem";
 import { OperationType } from "../types";
 export const MULTI_SEND_ABI = ["function multiSend(bytes memory transactions)"];
 const MULTISEND_141 = "0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526";
@@ -39,3 +39,47 @@ export function isMultisendTx(args) {
     return (to === MULTISEND_141.toLowerCase() ||
         to === MULTISEND_CALLONLY_141.toLowerCase());
 }
+// import { Interface } from '@ethersproject/abi';
+// import { getAddress } from '@ethersproject/address';
+// import { BigNumber } from '@ethersproject/bignumber';
+function unpack(packed, startIndex) {
+    // read operation from first 8 bits (= 2 hex digits)
+    const operation = parseInt(packed.substring(startIndex, startIndex + 2), 16);
+    // the next 40 characters are the to address
+    const to = getAddress(`0x${packed.substring(startIndex + 2, startIndex + 42)}`);
+    // then comes the uint256 value (= 64 hex digits)
+    const value = toHex(BigInt(`0x${packed.substring(startIndex + 42, startIndex + 106)}`));
+    // and the uint256 data length (= 64 hex digits)
+    const hexDataLength = parseInt(packed.substring(startIndex + 106, startIndex + 170), 16);
+    const endIndex = startIndex + 170 + hexDataLength * 2; // * 2 because each hex item is represented with 2 digits
+    const data = `0x${packed.substring(startIndex + 170, endIndex)}`;
+    return {
+        operation,
+        to,
+        value,
+        data,
+        endIndex,
+    };
+}
+export function decodeMultiViem(data) {
+    // const multiSendContract = new Interface(MULTI_SEND_ABI);
+    // const tx = multiSendContract.parseTransaction({ data });
+    // const multiSendAbiItem = parseAbiItem({
+    //   type: "function",
+    //   name: "multiSend",
+    //   inputs: [{ name: "data", type: "bytes" }],
+    // });
+    const tx = decodeFunctionData({
+        abi: MULTI_SEND_ABI,
+        data,
+    });
+    const [transactionsEncoded] = tx.args;
+    const result = [];
+    let startIndex = 2; // skip over 0x
+    while (startIndex < transactionsEncoded.length) {
+        const { endIndex, ...tx } = unpack(transactionsEncoded, startIndex);
+        result.push(tx);
+        startIndex = endIndex;
+    }
+    return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.8.3",
+  "version": "0.8.5-beta.0",
   "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;