Merge pull request #241 from pimlicolabs/feat/log-op-when-rejected

Feat/log op when rejected
pimlicolabs · Jun 6, 2024 · bb06c41 · bb06c41
2 parents 2b12c46 + 044d62d
commit bb06c41
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/.changeset/mean-dingos-admire.md b/.changeset/mean-dingos-admire.md
@@ -0,0 +1,5 @@
+---
+"@pimlico/alto": patch
+---
+
+Log userOperation fields when rejected
diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -610,6 +610,7 @@ export class Executor {
                     error: {
                         entryPoint,
                         userOpHash: owh.userOperationHash,
+                        userOperation: owh.mempoolUserOperation,
                         reason: "INTERNAL FAILURE"
                     }
                 }
@@ -625,6 +626,7 @@ export class Executor {
                     error: {
                         entryPoint,
                         userOpHash: op.owh.userOperationHash,
+                        userOperation: op.owh.mempoolUserOperation,
                         reason: op.reason as string
                     }
                 }
@@ -720,6 +722,7 @@ export class Executor {
                     error: {
                         entryPoint,
                         userOpHash: owh.userOperationHash,
+                        userOperation: owh.mempoolUserOperation,
                         reason: "INTERNAL FAILURE"
                     }
                 }
@@ -892,6 +895,7 @@ export class Executor {
                             entryPoint,
                             this.walletClient.chain.id
                         ),
+                        userOperation: compressedOp,
                         reason: "INTERNAL FAILURE"
                     }
                 }
@@ -910,6 +914,7 @@ export class Executor {
                     error: {
                         entryPoint,
                         userOpHash: simulatedOp.owh.userOperationHash,
+                        userOperation: simulatedOp.owh.mempoolUserOperation,
                         reason: simulatedOp.reason as string
                     }
                 }
@@ -957,6 +962,7 @@ export class Executor {
                     error: {
                         entryPoint,
                         userOpHash: op.userOperationHash,
+                        userOperation: op.mempoolUserOperation,
                         reason: "INTERNAL FAILURE"
                     }
                 }

diff --git a/src/executor/executorManager.ts b/src/executor/executorManager.ts
@@ -222,6 +222,11 @@ export class ExecutorManager {
                 })
                 this.logger.warn(
                     {
+                        userOperation: JSON.stringify(
+                            result.error.userOperation,
+                            (_k, v) =>
+                                typeof v === "bigint" ? v.toString() : v
+                        ),
                         userOpHash: result.error.userOpHash,
                         reason: result.error.reason
                     },

diff --git a/src/executor/utils.ts b/src/executor/utils.ts
@@ -68,6 +68,7 @@ export function simulatedOpsToResults(
             status: "failure",
             error: {
                 entryPoint: transactionInfo.entryPoint,
+                userOperation: sop.owh.mempoolUserOperation,
                 userOpHash: sop.owh.userOperationHash,
                 reason: sop.reason as string
             }
@@ -307,7 +308,10 @@ export async function filterOpsAndEstimateGas(
                         "user op in batch invalid"
                     )
 
-                    if (errorResult.errorName !== "FailedOp") {
+                    if (
+                        errorResult.errorName !== "FailedOpWithRevert" &&
+                        errorResult.errorName !== "FailedOp"
+                    ) {
                         logger.error(
                             {
                                 errorName: errorResult.errorName,

diff --git a/src/types/mempool.ts b/src/types/mempool.ts
@@ -90,11 +90,16 @@ export type BundleResult = Result<
         userOperation: UserOperationInfo
         transactionInfo: TransactionInfo
     },
-    { reason: string; userOpHash: HexData32; entryPoint: Address },
     {
         reason: string
         userOpHash: HexData32
+        entryPoint: Address
         userOperation: MempoolUserOperation
+    },
+    {
+        reason: string
+        userOpHash: HexData32
         entryPoint: Address
+        userOperation: MempoolUserOperation
     }
 >