near-safe 0.4.0 → 0.4.2

package/dist/cjs/{src/lib → lib}/multisend.d.ts

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

package/dist/cjs/{src/lib → lib}/multisend.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MULTI_SEND_ABI = void 0;
 exports.encodeMulti = encodeMulti;
+exports.isMultisendTx = isMultisendTx;
 const viem_1 = require("viem");
 const types_1 = require("../types");
 exports.MULTI_SEND_ABI = ["function multiSend(bytes memory transactions)"];
@@ -38,3 +39,8 @@ function encodeMulti(transactions, multiSendContractAddress = transactions.some(
         }),
     };
 }
+function isMultisendTx(args) {
+    const to = args[0].toLowerCase();
+    return (to === MULTISEND_141.toLowerCase() ||
+        to === MULTISEND_CALLONLY_141.toLowerCase());
+}

package/dist/{esm/src → cjs}/near-safe.d.ts

@@ -3,7 +3,7 @@ import { FinalExecutionOutcome } from "near-api-js/lib/providers";
 import { NearEthAdapter, SignRequestData } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { SafeContractSuite } from "./lib/safe";
-import { EncodedTxData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
+import { EncodedTxData, EvmTransactionData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
 export interface NearSafeConfig {
     accountId: string;
     mpcContractId: string;
@@ -41,6 +41,11 @@ export declare class NearSafe {
     sufficientlyFunded(chainId: number, transactions: MetaTransaction[], gasCost: bigint): Promise<boolean>;
     addOwnerTx(address: Address): MetaTransaction;
     private bundlerForChainId;
+    decodeTxData(data: EvmTransactionData): {
+        chainId: number;
+        costEstimate: string;
+        transactions: MetaTransaction[];
+    };
     /**
      * Handles routing of signature requests based on the provided method, chain ID, and parameters.
      *

package/dist/cjs/{src/near-safe.js → near-safe.js}

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NearSafe = void 0;
+const ethers_multisend_1 = require("ethers-multisend");
 const near_ca_1 = require("near-ca");
 const viem_1 = require("viem");
 const bundler_1 = require("./lib/bundler");
@@ -126,6 +127,33 @@ class NearSafe {
     bundlerForChainId(chainId) {
         return new bundler_1.Erc4337Bundler(this.safePack.entryPoint.address, this.pimlicoKey, chainId);
     }
+    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 sungular 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,
+        };
+    }
     /**
      * Handles routing of signature requests based on the provided method, chain ID, and parameters.
      *

package/dist/cjs/{src/types.d.ts → types.d.ts}

@@ -1,5 +1,5 @@
 import { FunctionCallTransaction, SignArgs } from "near-ca";
-import { Address, Hash, Hex, ParseAbi, TransactionSerializable } from "viem";
+import { Address, Hex, ParseAbi } from "viem";
 export type SafeDeployments = {
     singleton: Deployment;
     proxyFactory: Deployment;
@@ -101,12 +101,13 @@ export interface MetaTransaction {
     readonly data: string;
     readonly operation?: OperationType;
 }
+export interface EvmTransactionData {
+    chainId: number;
+    data: string;
+    hash: string;
+}
 export interface EncodedTxData {
-    evmData: {
-        chainId: number;
-        data: string | TransactionSerializable;
-        hash: Hash;
-    };
+    evmData: EvmTransactionData;
     nearPayload: FunctionCallTransaction<{
         request: SignArgs;
     }>;

package/dist/esm/{src/lib → lib}/multisend.d.ts

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

package/dist/esm/{src/lib → lib}/multisend.js

@@ -34,3 +34,8 @@ export function encodeMulti(transactions, multiSendContractAddress = transaction
         }),
     };
 }
+export function isMultisendTx(args) {
+    const to = args[0].toLowerCase();
+    return (to === MULTISEND_141.toLowerCase() ||
+        to === MULTISEND_CALLONLY_141.toLowerCase());
+}

package/dist/{cjs/src → esm}/near-safe.d.ts

@@ -3,7 +3,7 @@ import { FinalExecutionOutcome } from "near-api-js/lib/providers";
 import { NearEthAdapter, SignRequestData } from "near-ca";
 import { Address, Hash, Hex } from "viem";
 import { SafeContractSuite } from "./lib/safe";
-import { EncodedTxData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
+import { EncodedTxData, EvmTransactionData, MetaTransaction, UserOperation, UserOperationReceipt } from "./types";
 export interface NearSafeConfig {
     accountId: string;
     mpcContractId: string;
@@ -41,6 +41,11 @@ export declare class NearSafe {
     sufficientlyFunded(chainId: number, transactions: MetaTransaction[], gasCost: bigint): Promise<boolean>;
     addOwnerTx(address: Address): MetaTransaction;
     private bundlerForChainId;
+    decodeTxData(data: EvmTransactionData): {
+        chainId: number;
+        costEstimate: string;
+        transactions: MetaTransaction[];
+    };
     /**
      * Handles routing of signature requests based on the provided method, chain ID, and parameters.
      *

package/dist/esm/{src/near-safe.js → near-safe.js}

@@ -1,7 +1,8 @@
+import { decodeMulti } from "ethers-multisend";
 import { setupAdapter, signatureFromOutcome, toPayload, } from "near-ca";
-import { serializeSignature } from "viem";
+import { decodeFunctionData, formatEther, serializeSignature, } from "viem";
 import { Erc4337Bundler } from "./lib/bundler";
-import { encodeMulti } from "./lib/multisend";
+import { encodeMulti, isMultisendTx } from "./lib/multisend";
 import { SafeContractSuite } from "./lib/safe";
 import { decodeSafeMessage } from "./lib/safe-message";
 import { getClient, isContract, metaTransactionsFromRequest, packSignature, } from "./util";
@@ -129,6 +130,33 @@ export class NearSafe {
     bundlerForChainId(chainId) {
         return new Erc4337Bundler(this.safePack.entryPoint.address, this.pimlicoKey, chainId);
     }
+    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 sungular 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,
+        };
+    }
     /**
      * Handles routing of signature requests based on the provided method, chain ID, and parameters.
      *

package/dist/esm/{src/types.d.ts → types.d.ts}

@@ -1,5 +1,5 @@
 import { FunctionCallTransaction, SignArgs } from "near-ca";
-import { Address, Hash, Hex, ParseAbi, TransactionSerializable } from "viem";
+import { Address, Hex, ParseAbi } from "viem";
 export type SafeDeployments = {
     singleton: Deployment;
     proxyFactory: Deployment;
@@ -101,12 +101,13 @@ export interface MetaTransaction {
     readonly data: string;
     readonly operation?: OperationType;
 }
+export interface EvmTransactionData {
+    chainId: number;
+    data: string;
+    hash: string;
+}
 export interface EncodedTxData {
-    evmData: {
-        chainId: number;
-        data: string | TransactionSerializable;
-        hash: Hash;
-    };
+    evmData: EvmTransactionData;
     nearPayload: FunctionCallTransaction<{
         request: SignArgs;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "near-safe",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "license": "MIT",
   "description": "An SDK for controlling Ethereum Smart Accounts via ERC4337 from a Near Account.",
   "author": "bh2smith",
@@ -42,6 +42,7 @@
   },
   "dependencies": {
     "@safe-global/safe-gateway-typescript-sdk": "^3.22.2",
+    "ethers-multisend": "^3.1.0",
     "near-api-js": "^5.0.0",
     "near-ca": "^0.5.6",
     "semver": "^7.6.3",
@@ -68,7 +69,6 @@
     "yargs": "^17.7.2"
   },
   "resolutions": {
-    "glob": "^9.0.0",
-    "base-x": "^3.0.0"
+    "glob": "^11.0.0"
   }
 }

package/dist/cjs/scripts/fetch-deployments.d.ts

@@ -1,17 +0,0 @@
-import { Deployment, SafeDeployments } from "../src/types";
-export declare const SAFE_VERSION = "1.4.1";
-export declare const MODULE_VERSION = "0.3.0";
-type DeploymentFn = (filter?: {
-    version: string;
-}) => {
-    networkAddresses: {
-        [chainId: string]: string;
-    };
-    abi: unknown[];
-} | undefined;
-type DeploymentArgs = {
-    version: string;
-};
-export declare function getDeployment(fn: DeploymentFn, { version }: DeploymentArgs): Promise<Deployment>;
-export declare function fetchDeployments(safeVersion?: string, moduleVersion?: string): Promise<SafeDeployments>;
-export {};

package/dist/cjs/scripts/fetch-deployments.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MODULE_VERSION = exports.SAFE_VERSION = void 0;
-exports.getDeployment = getDeployment;
-exports.fetchDeployments = fetchDeployments;
-const safe_deployments_1 = require("@safe-global/safe-deployments");
-const safe_modules_deployments_1 = require("@safe-global/safe-modules-deployments");
-const viem_1 = require("viem");
-const util_1 = require("../src/util");
-// Define the deployment version and chain ID (e.g., "1.4.1" for Safe contracts, "0.3.0" for modules)
-exports.SAFE_VERSION = "1.4.1";
-exports.MODULE_VERSION = "0.3.0";
-async function getDeployment(fn, { version }) {
-    const deployment = fn({ version });
-    if (!deployment) {
-        throw new Error(`Deployment not found for ${fn.name} version ${version}`);
-    }
-    // TODO: maybe call parseAbi on deployment.abi here.
-    return {
-        address: deployment.networkAddresses["11155111"],
-        abi: deployment.abi,
-    };
-}
-async function fetchDeployments(safeVersion = exports.SAFE_VERSION, moduleVersion = exports.MODULE_VERSION) {
-    console.log("Fetching deployments...");
-    const safeDeployment = async (fn) => getDeployment(fn, { version: safeVersion });
-    const m4337Deployment = async (fn) => getDeployment(fn, { version: moduleVersion });
-    try {
-        // Fetch deployments for Safe and 4337 modules
-        const [singleton, proxyFactory, moduleSetup, m4337] = await Promise.all([
-            safeDeployment(safe_deployments_1.getSafeL2SingletonDeployment),
-            safeDeployment(safe_deployments_1.getProxyFactoryDeployment),
-            m4337Deployment(safe_modules_deployments_1.getSafeModuleSetupDeployment),
-            m4337Deployment(safe_modules_deployments_1.getSafe4337ModuleDeployment),
-        ]);
-        // TODO - this is a cheeky hack.
-        const client = (0, util_1.getClient)(11155111);
-        const entryPoint = {
-            address: (await client.readContract({
-                address: m4337.address,
-                abi: m4337.abi,
-                functionName: "SUPPORTED_ENTRYPOINT",
-            })),
-            abi: (0, viem_1.parseAbi)([
-                "function getNonce(address, uint192 key) view returns (uint256 nonce)",
-            ]),
-        };
-        return {
-            singleton,
-            proxyFactory,
-            moduleSetup,
-            m4337,
-            entryPoint,
-        };
-    }
-    catch (error) {
-        throw new Error(`Error fetching deployments: ${error}`);
-    }
-}

package/dist/esm/scripts/fetch-deployments.d.ts

@@ -1,17 +0,0 @@
-import { Deployment, SafeDeployments } from "../src/types";
-export declare const SAFE_VERSION = "1.4.1";
-export declare const MODULE_VERSION = "0.3.0";
-type DeploymentFn = (filter?: {
-    version: string;
-}) => {
-    networkAddresses: {
-        [chainId: string]: string;
-    };
-    abi: unknown[];
-} | undefined;
-type DeploymentArgs = {
-    version: string;
-};
-export declare function getDeployment(fn: DeploymentFn, { version }: DeploymentArgs): Promise<Deployment>;
-export declare function fetchDeployments(safeVersion?: string, moduleVersion?: string): Promise<SafeDeployments>;
-export {};

package/dist/esm/scripts/fetch-deployments.js

@@ -1,54 +0,0 @@
-import { getProxyFactoryDeployment, getSafeL2SingletonDeployment, } from "@safe-global/safe-deployments";
-import { getSafe4337ModuleDeployment, getSafeModuleSetupDeployment, } from "@safe-global/safe-modules-deployments";
-import { parseAbi } from "viem";
-import { getClient } from "../src/util";
-// Define the deployment version and chain ID (e.g., "1.4.1" for Safe contracts, "0.3.0" for modules)
-export const SAFE_VERSION = "1.4.1";
-export const MODULE_VERSION = "0.3.0";
-export async function getDeployment(fn, { version }) {
-    const deployment = fn({ version });
-    if (!deployment) {
-        throw new Error(`Deployment not found for ${fn.name} version ${version}`);
-    }
-    // TODO: maybe call parseAbi on deployment.abi here.
-    return {
-        address: deployment.networkAddresses["11155111"],
-        abi: deployment.abi,
-    };
-}
-export async function fetchDeployments(safeVersion = SAFE_VERSION, moduleVersion = MODULE_VERSION) {
-    console.log("Fetching deployments...");
-    const safeDeployment = async (fn) => getDeployment(fn, { version: safeVersion });
-    const m4337Deployment = async (fn) => getDeployment(fn, { version: moduleVersion });
-    try {
-        // Fetch deployments for Safe and 4337 modules
-        const [singleton, proxyFactory, moduleSetup, m4337] = await Promise.all([
-            safeDeployment(getSafeL2SingletonDeployment),
-            safeDeployment(getProxyFactoryDeployment),
-            m4337Deployment(getSafeModuleSetupDeployment),
-            m4337Deployment(getSafe4337ModuleDeployment),
-        ]);
-        // TODO - this is a cheeky hack.
-        const client = getClient(11155111);
-        const entryPoint = {
-            address: (await client.readContract({
-                address: m4337.address,
-                abi: m4337.abi,
-                functionName: "SUPPORTED_ENTRYPOINT",
-            })),
-            abi: parseAbi([
-                "function getNonce(address, uint192 key) view returns (uint256 nonce)",
-            ]),
-        };
-        return {
-            singleton,
-            proxyFactory,
-            moduleSetup,
-            m4337,
-            entryPoint,
-        };
-    }
-    catch (error) {
-        throw new Error(`Error fetching deployments: ${error}`);
-    }
-}