@pimlico/alto 0.0.4 → 0.0.5

package/lib/utils/userop.js

@@ -1,10 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toUnpackedUserOperation = exports.getNonceKeyAndValue = exports.getUserOperationHash = exports.getUserOperationHashV07 = exports.getUserOperationHashV06 = exports.transactionIncluded = exports.getAddressFromInitCodeOrPaymasterAndData = exports.deepHexlify = exports.toPackedUserOperation = exports.unpackPaymasterAndData = exports.getPaymasterAndData = exports.unpackGasLimits = exports.getGasLimits = exports.unpackAccountGasLimits = exports.getAccountGasLimits = exports.unPackInitCode = exports.getInitCode = exports.isVersion07 = exports.isVersion06 = void 0;
+exports.parseUserOperationReceipt = exports.getRequiredPrefund = exports.toUnpackedUserOperation = exports.getNonceKeyAndValue = exports.getUserOperationHash = exports.getUserOperationHashV07 = exports.getUserOperationHashV06 = exports.getBundleStatus = exports.getAddressFromInitCodeOrPaymasterAndData = exports.deepHexlify = exports.toPackedUserOperation = exports.unpackPaymasterAndData = exports.getPaymasterAndData = exports.unpackGasLimits = exports.getGasLimits = exports.unpackAccountGasLimits = exports.getAccountGasLimits = exports.unPackInitCode = exports.getInitCode = exports.isVersion07 = exports.isVersion06 = void 0;
 const types_1 = require("../types/index.js");
-const node_1 = require("@sentry/node");
+const sentry = __importStar(require("@sentry/node"));
 const viem_1 = require("viem");
 const helpers_1 = require("./helpers.js");
+const zod_1 = require("zod");
+const zod_validation_error_1 = require("zod-validation-error");
 // Type predicate check if the UserOperation is V06.
 function isVersion06(operation) {
     return "initCode" in operation && "paymasterAndData" in operation;
@@ -150,81 +175,101 @@ function getAddressFromInitCodeOrPaymasterAndData(data) {
     return null;
 }
 exports.getAddressFromInitCodeOrPaymasterAndData = getAddressFromInitCodeOrPaymasterAndData;
-const transactionIncluded = async (isVersion06, txHash, publicClient, entryPoint) => {
+// Return the status of the bundling transaction.
+const getBundleStatus = async (isVersion06, txHash, publicClient, logger, entryPoint) => {
     try {
-        const rcp = await publicClient.getTransactionReceipt({ hash: txHash });
-        if (rcp.status === "success") {
-            // find if any logs are UserOperationEvent or AccountDeployed
-            const r = rcp.logs
-                .map((l) => {
-                if ((0, helpers_1.areAddressesEqual)(l.address, entryPoint)) {
-                    try {
-                        const log = (0, viem_1.decodeEventLog)({
-                            abi: isVersion06
-                                ? types_1.EntryPointV06Abi
-                                : types_1.EntryPointV07Abi,
-                            data: l.data,
-                            topics: l.topics
+        const receipt = await publicClient.getTransactionReceipt({
+            hash: txHash
+        });
+        const blockNumber = receipt.blockNumber;
+        if (receipt.status === "reverted") {
+            const bundlingStatus = {
+                status: "reverted",
+                isAA95: false
+            };
+            if ("error" in receipt) {
+                try {
+                    const match = receipt.error.match(/0x([a-fA-F0-9]+)?/);
+                    if (match) {
+                        const revertReason = match[0];
+                        const decoded = (0, viem_1.decodeErrorResult)({
+                            data: revertReason,
+                            abi: (0, viem_1.parseAbi)([
+                                "error FailedOp(uint256 opIndex, string reason)"
+                            ])
                         });
-                        if (log.eventName === "AccountDeployed") {
-                            return {
-                                userOperationHash: log.args.userOpHash,
-                                success: !!log.args.factory,
-                                accountDeployed: true
-                            };
-                        }
-                        if (log.eventName === "UserOperationEvent") {
-                            return {
-                                userOperationHash: log.args.userOpHash,
-                                success: !!log.args.success,
-                                accountDeployed: false
-                            };
+                        if (decoded.args[1] === "AA95 out of gas") {
+                            bundlingStatus.isAA95 = true;
                         }
-                        return undefined;
-                    }
-                    catch (_e) {
-                        (0, node_1.captureException)(_e);
-                        return undefined;
                     }
                 }
-                return undefined;
-            })
-                .reduce((result, log) => {
-                if (log) {
-                    result[log.userOperationHash] = {
-                        userOperationHash: log.userOperationHash,
-                        accountDeployed: log.accountDeployed ||
-                            result[log.userOperationHash]
-                                ?.accountDeployed,
-                        success: log.success ||
-                            result[log.userOperationHash]?.success
-                    };
-                    return result;
+                catch (e) {
+                    logger.error("Failed to decode userOperation revert reason due to ", e);
                 }
-                return result;
-            }, {});
-            const success = Object.values(r).reduce((x, v) => x || v.success, false);
-            if (success) {
-                return {
-                    status: "included",
-                    ...r
-                };
             }
-            return {
-                status: "reverted"
-            };
+            return { bundlingStatus, blockNumber };
         }
+        const userOperationDetails = receipt.logs
+            .filter((log) => (0, helpers_1.areAddressesEqual)(log.address, entryPoint))
+            .reduce((result, log) => {
+            try {
+                const { data, topics } = log;
+                const { eventName, args } = (0, viem_1.decodeEventLog)({
+                    abi: isVersion06 ? types_1.EntryPointV06Abi : types_1.EntryPointV07Abi,
+                    data,
+                    topics
+                });
+                if (eventName === "AccountDeployed" ||
+                    eventName === "UserOperationRevertReason" ||
+                    eventName === "UserOperationEvent") {
+                    const opHash = args.userOpHash;
+                    // create result entry if doesn't exist
+                    result[opHash] ??= {
+                        accountDeployed: false,
+                        status: "succesful"
+                    };
+                    switch (eventName) {
+                        case "AccountDeployed": {
+                            result[opHash].accountDeployed = true;
+                            break;
+                        }
+                        case "UserOperationRevertReason": {
+                            result[opHash].revertReason = args.revertReason;
+                            break;
+                        }
+                        case "UserOperationEvent": {
+                            const status = args.success
+                                ? "succesful"
+                                : "calldata_phase_reverted";
+                            result[opHash].status = status;
+                            break;
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                sentry.captureException(e);
+            }
+            return result;
+        }, {});
         return {
-            status: "failed"
+            bundlingStatus: {
+                status: "included",
+                userOperationDetails
+            },
+            blockNumber
         };
     }
-    catch (_e) {
+    catch {
         return {
-            status: "not_found"
+            bundlingStatus: {
+                status: "not_found"
+            },
+            blockNumber: undefined
         };
     }
 };
-exports.transactionIncluded = transactionIncluded;
+exports.getBundleStatus = getBundleStatus;
 const getUserOperationHashV06 = (userOperation, entryPointAddress, chainId) => {
     const hash = (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)([
         {
@@ -392,39 +437,106 @@ function toUnpackedUserOperation(packedUserOperation) {
     };
 }
 exports.toUnpackedUserOperation = toUnpackedUserOperation;
-/*
- function pack(
-        UserOperation calldata userOp
-    ) internal pure returns (bytes memory ret) {
-        address sender = getSender(userOp);
-        uint256 nonce = userOp.nonce;
-        bytes32 hashInitCode = calldataKeccak(userOp.initCode);
-        bytes32 hashCallData = calldataKeccak(userOp.callData);
-        uint256 callGasLimit = userOp.callGasLimit;
-        uint256 verificationGasLimit = userOp.verificationGasLimit;
-        uint256 preVerificationGas = userOp.preVerificationGas;
-        uint256 maxFeePerGas = userOp.maxFeePerGas;
-        uint256 maxPriorityFeePerGas = userOp.maxPriorityFeePerGas;
-        bytes32 hashPaymasterAndData = calldataKeccak(userOp.paymasterAndData);
-
-        return abi.encode(
-            sender, nonce,
-            hashInitCode, hashCallData,
-            callGasLimit, verificationGasLimit, preVerificationGas,
-            maxFeePerGas, maxPriorityFeePerGas,
-            hashPaymasterAndData
-        );
+const getRequiredPrefund = (userOperation) => {
+    if (isVersion06(userOperation)) {
+        const op = userOperation;
+        const multiplier = (op.paymasterAndData?.length ?? 0) > 2 ? BigInt(3) : BigInt(1);
+        const requiredGas = op.callGasLimit +
+            op.verificationGasLimit * multiplier +
+            op.preVerificationGas;
+        return BigInt(requiredGas) * BigInt(op.maxFeePerGas);
+    }
+    const op = userOperation;
+    const requiredGas = op.verificationGasLimit +
+        op.callGasLimit +
+        (op.paymasterVerificationGasLimit || 0n) +
+        (op.paymasterPostOpGasLimit || 0n) +
+        op.preVerificationGas;
+    return requiredGas * op.maxFeePerGas;
+};
+exports.getRequiredPrefund = getRequiredPrefund;
+function parseUserOperationReceipt(userOpHash, receipt) {
+    const userOperationRevertReasonAbi = (0, viem_1.parseAbi)([
+        "event UserOperationRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)"
+    ]);
+    const userOperationEventTopic = (0, viem_1.encodeEventTopics)({
+        abi: types_1.EntryPointV06Abi,
+        eventName: "UserOperationEvent"
+    });
+    const userOperationRevertReasonTopicEvent = (0, viem_1.encodeEventTopics)({
+        abi: userOperationRevertReasonAbi
+    })[0];
+    let entryPoint = viem_1.zeroAddress;
+    let revertReason = undefined;
+    let startIndex = -1;
+    let endIndex = -1;
+    receipt.logs.forEach((log, index) => {
+        if (log?.topics[0] === userOperationEventTopic[0]) {
+            // process UserOperationEvent
+            if (log.topics[1] === userOpHash) {
+                // it's our userOpHash. save as end of logs array
+                endIndex = index;
+                entryPoint = log.address;
+            }
+            else if (endIndex === -1) {
+                // it's a different hash. remember it as beginning index, but only if we didn't find our end index yet.
+                startIndex = index;
+            }
+        }
+        if (log?.topics[0] === userOperationRevertReasonTopicEvent) {
+            // process UserOperationRevertReason
+            if (log.topics[1] === userOpHash) {
+                // it's our userOpHash. capture revert reason.
+                const decodedLog = (0, viem_1.decodeEventLog)({
+                    abi: userOperationRevertReasonAbi,
+                    data: log.data,
+                    topics: log.topics
+                });
+                revertReason = decodedLog.args.revertReason;
+            }
+        }
+    });
+    if (endIndex === -1) {
+        throw new Error("fatal: no UserOperationEvent in logs");
+    }
+    const filteredLogs = receipt.logs.slice(startIndex + 1, endIndex);
+    const logsParsing = zod_1.z.array(types_1.logSchema).safeParse(filteredLogs);
+    if (!logsParsing.success) {
+        const err = (0, zod_validation_error_1.fromZodError)(logsParsing.error);
+        throw err;
+    }
+    const receiptParsing = types_1.receiptSchema.safeParse({
+        ...receipt,
+        status: receipt.status === "success" ? 1 : 0
+    });
+    if (!receiptParsing.success) {
+        const err = (0, zod_validation_error_1.fromZodError)(receiptParsing.error);
+        throw err;
     }
-
-
-    const encodedData = encodeAbiParameters(
-  [
-    { name: 'x', type: 'string' },
-    { name: 'y', type: 'uint' },
-    { name: 'z', type: 'bool' }
-  ],
-  ['wagmi', 420n, true]
-)
-
-*/
+    const userOperationEvent = (0, viem_1.parseEventLogs)({
+        abi: types_1.EntryPointV06Abi,
+        eventName: "UserOperationEvent",
+        args: {
+            userOpHash
+        },
+        logs: receipt.logs
+    })[0];
+    let paymaster = userOperationEvent.args.paymaster;
+    paymaster = paymaster === viem_1.zeroAddress ? undefined : paymaster;
+    const userOperationReceipt = {
+        userOpHash,
+        entryPoint,
+        sender: userOperationEvent.args.sender,
+        nonce: userOperationEvent.args.nonce,
+        paymaster,
+        actualGasUsed: userOperationEvent.args.actualGasUsed,
+        actualGasCost: userOperationEvent.args.actualGasCost,
+        success: userOperationEvent.args.success,
+        reason: revertReason,
+        logs: logsParsing.data,
+        receipt: receiptParsing.data
+    };
+    return userOperationReceipt;
+}
+exports.parseUserOperationReceipt = parseUserOperationReceipt;
 //# sourceMappingURL=userop.js.map

package/lib/utils/userop.js.map

@@ -1 +1 @@
-{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../utils/userop.ts"],"names":[],"mappings":"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"}

package/lib/utils/validation.d.ts

@@ -1,6 +1,6 @@
 import { type Address, type ChainType, type PackedUserOperation, type UserOperation, type UserOperationV06 } from "../types/index.js";
 import { type Chain, ContractFunctionRevertedError, EstimateGasExecutionError, FeeCapTooLowError, InsufficientFundsError, IntrinsicGasTooLowError, NonceTooLowError, type PublicClient, type Transport } from "viem";
-import type { GasPriceManager } from "./gasPriceManager.js";
+import type { GasPriceManager } from "../handlers/index.js";
 export interface GasOverheads {
     /**
      * fixed overhead for entire handleOp bundle.

package/lib/utils/validation.js

@@ -1,32 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseViemError = exports.calcArbitrumPreVerificationGas = exports.calcOptimismPreVerificationGas = exports.calcDefaultPreVerificationGas = exports.calcVerificationGasAndCallGasLimit = exports.calcPreVerificationGas = exports.packUserOpV07 = exports.removeZeroBytesFromUserOp = exports.packUserOpV06 = exports.DefaultGasOverheads = void 0;
 const types_1 = require("../types/index.js");
 const viem_1 = require("viem");
-const chains = __importStar(require("viem/chains"));
+const chains_1 = require("viem/chains");
 const userop_1 = require("./userop.js");
 const bigInt_1 = require("./bigInt.js");
 exports.DefaultGasOverheads = {
@@ -236,9 +213,9 @@ function calcVerificationGasAndCallGasLimit(userOperation, executionResult, chai
     let callGasLimit = (calculatedCallGasLimit > 9000n ? calculatedCallGasLimit : 9000n) +
         21000n +
         50000n;
-    if (chainId === chains.baseGoerli.id ||
-        chainId === chains.baseSepolia.id ||
-        chainId === chains.base.id) {
+    if (chainId === chains_1.baseGoerli.id ||
+        chainId === chains_1.baseSepolia.id ||
+        chainId === chains_1.base.id) {
         callGasLimit = (110n * callGasLimit) / 100n;
     }
     return { verificationGasLimit, callGasLimit };
@@ -348,8 +325,11 @@ async function calcOptimismPreVerificationGas(publicClient, op, entryPoint, stat
             public: publicClient
         }
     });
-    const { result: l1Fee } = await opGasPriceOracle.simulate.getL1Fee([
-        serializedTx
+    const [{ result: l1Fee }, baseFeePerGas] = await Promise.all([
+        opGasPriceOracle.simulate.getL1Fee([serializedTx]),
+        verify
+            ? gasPriceManager.getMaxBaseFeePerGas()
+            : gasPriceManager.getBaseFee()
     ]);
     if (op.maxFeePerGas <= 1n || op.maxPriorityFeePerGas <= 1n) {
         // if user didn't provide gasPrice values, fetch current going price rate
@@ -358,13 +338,6 @@ async function calcOptimismPreVerificationGas(publicClient, op, entryPoint, stat
         op.maxFeePerGas = gasPrices.maxFeePerGas;
     }
     const l2MaxFee = op.maxFeePerGas;
-    let baseFeePerGas = 0n;
-    if (verify) {
-        baseFeePerGas = await gasPriceManager.getMaxBaseFeePerGas();
-    }
-    else {
-        baseFeePerGas = await gasPriceManager.getBaseFee();
-    }
     const l2PriorityFee = baseFeePerGas + op.maxPriorityFeePerGas;
     const l2price = (0, bigInt_1.minBigInt)(l2MaxFee, l2PriorityFee);
     return staticFee + l1Fee / l2price;

package/lib/utils/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../utils/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../utils/validation.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pimlico/alto",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A performant and modular ERC-4337 Bundler written in Typescript",
   "repository": "https://github.com/pimlicolabs/alto.git",
   "author": "Pimlico",
@@ -26,16 +26,17 @@
   "dependencies": {
     "@fastify/cors": "^9.0.1",
     "@fastify/websocket": "^10.0.1",
-    "@opentelemetry/api": "^1.7.0",
-    "@opentelemetry/core": "^1.19.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "^0.46.0",
-    "@opentelemetry/instrumentation-fastify": "^0.32.5",
-    "@opentelemetry/instrumentation-http": "^0.46.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.36.0",
-    "@opentelemetry/instrumentation-pino": "^0.34.4",
-    "@opentelemetry/sdk-node": "^0.46.0",
-    "@opentelemetry/sdk-trace-base": "^1.19.0",
-    "@opentelemetry/semantic-conventions": "^1.19.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/core": "^1.25.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "^0.52.1",
+    "@opentelemetry/instrumentation-fastify": "^0.38.0",
+    "@opentelemetry/instrumentation-http": "^0.52.1",
+    "@opentelemetry/instrumentation-ioredis": "^0.42.0",
+    "@opentelemetry/instrumentation-pino": "^0.41.0",
+    "@opentelemetry/instrumentation-undici": "^0.4.0",
+    "@opentelemetry/sdk-node": "^0.52.1",
+    "@opentelemetry/sdk-trace-base": "^1.25.1",
+    "@opentelemetry/semantic-conventions": "^1.25.1",
     "@sentry/node": "^7.83.0",
     "@types/node": "^18.16.3",
     "@types/ws": "^8.5.10",
@@ -43,12 +44,13 @@
     "async-mutex": "^0.4.0",
     "dotenv": "^16.0.3",
     "fastify": "^4.25.2",
-    "opentelemetry-instrumentation-fetch-node": "^1.1.2",
+    "ioredis": "^5.4.1",
+    "opentelemetry-instrumentation-fetch-node": "^1.2.3",
     "pino": "^8.15.0",
     "pino-http": "^8.4.0",
     "pino-pretty": "^10.0.0",
     "prom-client": "^14.2.0",
-    "viem": "^2.9.5",
+    "viem": "^2.19.0",
     "yargs": "^17.7.1",
     "zod": "^3.21.4",
     "zod-validation-error": "^1.3.0"
@@ -66,7 +68,6 @@
     "build": "tsc -p ./tsconfig.json && tsc-alias -p tsconfig.json",
     "build:esm": "tsc -p ./tsconfig.esm.json && tsc-alias -p tsconfig.esm.json",
     "dev": "nodemon --exec DOTENV_CONFIG_PATH=$(pwd)/../.env ts-node -r tsconfig-paths/register cli/alto.ts run",
-    "test": "test -d test && mocha test/**/*.test.ts --exit || echo 'No test folder found. Skipping tests.'",
     "lint": "eslint src/**/*.ts",
     "lint:fix": "eslint src/**/*.ts --fix"
   }

package/esm/executor/test/utils.d.ts

@@ -1,13 +0,0 @@
-import { type Address, type HexData, UserOperationV06 } from "../../types/index.js";
-import { type Clients } from "../../utils/index.js";
-import { type Account } from "viem";
-export declare const TEST_OP: UserOperationV06;
-export declare function getSender(entryPoint: Address, initCode: HexData, clients: Clients): Promise<Address>;
-export declare function createOp(entryPoint: Address, simpleAccountFactory: Address, signer: Account, clients: Clients, maxFeePerGas?: bigint, nonce?: bigint): Promise<UserOperationV06>;
-export declare const generateAccounts: (clients: Clients) => Promise<(import("viem").CustomSource & {
-    address: `0x${string}`;
-    publicKey: `0x${string}`;
-    source: "privateKey";
-    type: "local";
-})[]>;
-//# sourceMappingURL=utils.d.ts.map