clean up poll

Author: chaitanyapotti

packages/providers/account-abstraction-provider/src/providers/AccountAbstractionProvider.ts

@@ -97,7 +97,7 @@ export class AccountAbstractionProvider extends BaseProvider<AccountAbstractionP
     // setup public client for viem smart account
     this._publicClient = createPublicClient({
       chain,
-      transport: http(),
+      transport: http(this.config.chainConfig.rpcTarget),
     }) as Client;
     this._smartAccount = await this.config.smartAccountInit.getSmartAccount({
       owner: eoaProvider,

packages/providers/account-abstraction-provider/src/providers/utils.ts

@@ -1,53 +1,10 @@
 import { addHexPrefix, isHexString } from "@ethereumjs/util";
-import { sleep } from "@toruslabs/base-controllers";
 import { JRPCRequest, providerErrors } from "@web3auth/auth";
 import { IProvider, log } from "@web3auth/base";
 import { IProviderHandlers, MessageParams, SignTypedDataMessageV4, TransactionParams, TypedMessageParams } from "@web3auth/ethereum-provider";
 import { Chain, createWalletClient, Hex, http } from "viem";
 import { BundlerClient, SendUserOperationParameters, SmartAccount } from "viem/account-abstraction";
 
-type PollOptions<data> = {
-  // Whether or not to emit when the polling starts.
-  emitOnBegin?: boolean | undefined;
-  // The initial wait time (in ms) before polling.
-  initialWaitTime?: ((data: data | void) => Promise<number>) | undefined;
-  // The interval (in ms).
-  interval: number;
-};
-
-/**
- * Polls a function at a specified interval.
- * same poll function as viem/utils/poll
- */
-export function poll<data>(
-  fn: ({ unpoll }: { unpoll: () => void }) => Promise<data | void>,
-  { emitOnBegin, initialWaitTime, interval }: PollOptions<data>
-) {
-  let active = true;
-
-  const unwatch = () => (active = false);
-
-  const watch = async () => {
-    let data: data | void;
-    if (emitOnBegin) data = await fn({ unpoll: unwatch });
-
-    const initialWait = (await initialWaitTime?.(data)) ?? interval;
-    await sleep(initialWait);
-
-    const _poll = async () => {
-      if (!active) return;
-      await fn({ unpoll: unwatch });
-      await sleep(interval);
-      _poll();
-    };
-
-    _poll();
-  };
-  watch();
-
-  return unwatch;
-}
-
 export function getProviderHandlers({
   bundlerClient,
   smartAccount,
@@ -105,43 +62,14 @@ export function getProviderHandlers({
       // @ts-expect-error viem types are too deep
       const userOpHash = await bundlerClient.sendUserOperation(userOperationParams);
 
-      const timeout = 120_000;
-      return new Promise((resolve, reject) => {
-        const done = (fn: () => void) => {
-          // eslint-disable-next-line @typescript-eslint/no-use-before-define, no-use-before-define
-          unpoll();
-          fn();
-        };
-
-        const unpoll = poll(
-          async () => {
-            // keep checking for user operation until it is online to return the transaction hash
-            // without needing to wait for the receipt
-            try {
-              const receipt = await bundlerClient.getUserOperation({ hash: userOpHash });
-              done(() => resolve(receipt.transactionHash));
-            } catch (error) {
-              if (!(error instanceof Error && error?.message?.toLowerCase()?.includes("could not be found"))) {
-                done(() => reject(error));
-              }
-            }
-          },
-          {
-            interval: 1000,
-          }
-        );
-
-        setTimeout(() => {
-          done(() =>
-            reject(
-              providerErrors.custom({
-                message: "Process transaction wait timeout.",
-                code: 4904,
-              })
-            )
-          );
-        }, timeout);
-      });
+      const txReceipt = await bundlerClient.waitForUserOperationReceipt({ hash: userOpHash });
+      if (!txReceipt.success) {
+        throw providerErrors.custom({
+          message: txReceipt.reason,
+          code: 4905,
+        });
+      }
+      return txReceipt.receipt.transactionHash;
     },
     processSignTransaction: async (txParams: TransactionParams): Promise<string> => {
       const { to, value, data } = txParams;