near-safe 0.8.4 → 0.8.5-beta.0

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

@@ -5,3 +5,13 @@ export declare function decodeTransactionSerializable(chainId: number, tx: Trans
 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/util.js

@@ -4,7 +4,7 @@ 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");
@@ -52,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/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/util.d.ts

@@ -5,3 +5,13 @@ export declare function decodeTransactionSerializable(chainId: number, tx: Trans
 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/util.js

@@ -1,4 +1,4 @@
-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";

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.4",
+  "version": "0.8.5-beta.0",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",