From 0700fb2715ef96fd75f3297e36452528a37402ab Mon Sep 17 00:00:00 2001
From: Alec Ananian <1013230+alecananian@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:12:18 -0700
Subject: [PATCH] api: fix userop error parsing

---
 apps/api/src/utils/error.test.ts | 5 +++++
 apps/api/src/utils/error.ts      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/api/src/utils/error.test.ts b/apps/api/src/utils/error.test.ts
index 85a494f3..20118fad 100644
--- a/apps/api/src/utils/error.test.ts
+++ b/apps/api/src/utils/error.test.ts
@@ -11,6 +11,11 @@ describe("error utils", () => {
         "UserOp failed with reason: 'Only basic foxes can be evolved' at txHash: 0xe4d9bfb4e5b6c8d5bd96dff274a6514d5b340df0245158a2690d682fd91d5a49",
       ),
     ).toBe("Only basic foxes can be evolved");
+    expect(
+      normalizeEngineErrorMessage(
+        `"UserOp failed with reason: 'Today's reward already claimed' at txHash: 0x87b84a73945663a8e8e77a92a7cb4391fb21c6817d00bb747de9e723e610346a",`,
+      ),
+    ).toBe("Today's reward already claimed");
     expect(
       normalizeEngineErrorMessage(
         `cannot estimate gas; transaction may fail or may require manual gas limit [ See: https://links.ethers.org/v5-errors-UNPREDICTABLE_GAS_LIMIT ] (reason="execution reverted: Today's reward already claimed", method="estimateGas", transaction={"from":"0xaC4d30E5a47A0815604F1f32BCD517C4B902476A","to":"0x1CebDDE81A9E4cd377bc7DA5000797407CF9A58A","value":{"type":"BigNumber","hex":"0x00"},"data":"0x06f71afa000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000191bf7b13ff0000000000000000000000000000000000000000000000056bc75e2d631000000000000000000000000000000000000000000000000000000000000000000041d5351ced72173e1690543f2d3edb744a059198ef815054fcca94fb2191751b0c38a9b10080ae135198e28eaceb39b1abf2509a9f1c67915ba5a6adbf22c7d8d41b00000000000000000000000000000000000000000000000000000000000000","accessList":null}, error={"code":3,"data":"0x08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001e546f64617927732072657761726420616c726561647920636c61696d65640000"}, code=UNPREDICTABLE_GAS_LIMIT, version=providers/5.7.2)`,
diff --git a/apps/api/src/utils/error.ts b/apps/api/src/utils/error.ts
index dc506d66..8a5b4f41 100644
--- a/apps/api/src/utils/error.ts
+++ b/apps/api/src/utils/error.ts
@@ -63,7 +63,7 @@ export const parseEngineErrorMessage = (err: ApiError | Error) => {
 
 export const normalizeEngineErrorMessage = (message: string) => {
   const groups =
-    /(?:reason: '(.*?)')|(?:reason="execution reverted: (.*?)")|(?:eth_sendUserOperation error: {"message":"(.*?)")/gi.exec(
+    /(?:reason: '(.*?)' at)|(?:reason="execution reverted: (.*?)")|(?:eth_sendUserOperation error: {"message":"(.*?)")/gi.exec(
       message,
     );
   return groups?.slice(1).find((group) => group) ?? message;