parse receipt for success

latticexyz · Nov 9, 2024 · 3b489ec · 3b489ec
1 parent 051e0dd
commit 3b489ec
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/packages/entrykit/playground/wagmiConfig.ts b/packages/entrykit/playground/wagmiConfig.ts
@@ -8,6 +8,9 @@ const chains = [
     ...anvil,
     rpcUrls: {
       ...anvil.rpcUrls,
+      bundler: {
+        http: ["http://127.0.0.1:4337"],
+      },
       // TODO: automatically grant allowance in anvil instead of requiring the service
       quarryPassIssuer: {
         http: ["http://127.0.0.1:3003/rpc"],

diff --git a/packages/paymaster/src/transports/methods/estimateUserOperationGas.ts b/packages/paymaster/src/transports/methods/estimateUserOperationGas.ts
@@ -11,7 +11,7 @@ export async function estimateUserOperationGas(
   _params: rpcMethod["Parameters"],
 ): Promise<rpcMethod["ReturnType"]> {
   return formatUserOperationRequest({
-    callGasLimit: 50_000_000n,
+    callGasLimit: 20_000_000n,
     preVerificationGas: 200_000n,
     verificationGasLimit: 2_000_000n,
     paymasterVerificationGasLimit: 200_000n,

diff --git a/packages/paymaster/src/transports/methods/sendUserOperation.ts b/packages/paymaster/src/transports/methods/sendUserOperation.ts
@@ -1,12 +1,21 @@
-import { Client, Transport, Chain, Account, RpcUserOperation, RpcUserOperationReceipt, parseEther } from "viem";
+import {
+  Client,
+  Transport,
+  Chain,
+  Account,
+  RpcUserOperation,
+  RpcUserOperationReceipt,
+  parseEther,
+  parseEventLogs,
+} from "viem";
 import {
   formatUserOperation,
   toPackedUserOperation,
   getUserOperationHash,
   entryPoint07Address,
   entryPoint07Abi,
 } from "viem/account-abstraction";
-import { setBalance, writeContract } from "viem/actions";
+import { setBalance, waitForTransactionReceipt, writeContract } from "viem/actions";
 import { getAction } from "viem/utils";
 
 // TODO: move to common package?
@@ -67,9 +76,22 @@ export async function sendUserOperation({
     gas,
   });
 
+  const receipt = await getAction(
+    executor,
+    waitForTransactionReceipt,
+    "waitForTransactionReceipt",
+  )({ hash: transactionHash });
+
+  // TODO: replace with `getUserOperationReceipt`?
+  const parsedLogs = parseEventLogs({
+    logs: receipt.logs,
+    abi: entryPoint07Abi,
+    eventName: "UserOperationEvent" as const,
+  });
+
   return {
-    success: true,
+    success: parsedLogs[0]!.args.success,
     userOpHash,
-    receipt: { transactionHash },
+    receipt,
   };
 }