@0xbow/privacy-pools-core-sdk 0.1.21 → 0.1.22

package/src/core/account.service.ts

@@ -9,15 +9,31 @@ import {
   PoolInfo,
   PrivacyPoolAccount,
 } from "../types/account.js";
-import { DepositEvent, RagequitEvent, WithdrawalEvent } from "../types/events.js";
+import {
+  DepositEvent,
+  PoolEventsError,
+  PoolEventsResult,
+  RagequitEvent,
+  WithdrawalEvent,
+} from "../types/events.js";
+
 import { Logger } from "../utils/logger.js";
 import { AccountError } from "../errors/account.error.js";
 import { ErrorCode } from "../errors/base.error.js";
+import { EventError } from "../errors/events.error.js";
+
+type AccountServiceConfig =
+  | {
+    mnemonic: string;
+  }
+  | {
+    account: PrivacyPoolAccount;
+  };
 
 /**
  * Service responsible for managing privacy pool accounts and their associated commitments.
  * Handles account initialization, deposit/withdrawal tracking, and history synchronization.
- * 
+ *
  * @remarks
  * This service maintains the state of all pool accounts and their commitments across different
  * chains and scopes. It uses deterministic key generation to recover account state from a mnemonic.
@@ -28,34 +44,38 @@ export class AccountService {
 
   /**
    * Creates a new AccountService instance.
-   * 
+   *
    * @param dataService - Service for fetching on-chain events
-   * @param account - Optional existing account to initialize with
-   * @param mnemonic - Optional mnemonic for deterministic key generation
-   * 
+   * @param config - Configuration for the account service (either mnemonic or existing account)
+   * @param config.mnemonic - Optional mnemonic for deterministic key generation
+   * @param config.account - Optional existing account to initialize with
+   *
    * @throws {AccountError} If account initialization fails
    */
   constructor(
     private readonly dataService: DataService,
-    mnemonic: string,
-    account?: PrivacyPoolAccount,
+    config: AccountServiceConfig
   ) {
     this.logger = new Logger({ prefix: "Account" });
-    this.account = account || this._initializeAccount(mnemonic);
+    if ("mnemonic" in config) {
+      this.account = this._initializeAccount(config.mnemonic);
+    } else {
+      this.account = config.account;
+    }
   }
 
   /**
    * Initializes a new account from a mnemonic phrase.
-   * 
+   *
    * @param mnemonic - The mnemonic phrase to derive keys from
    * @returns A new PrivacyPoolAccount with derived master keys
-   * 
+   *
    * @remarks
    * This method derives two master keys from the mnemonic:
    * 1. A master nullifier key from account index 0
    * 2. A master secret key from account index 1
    * These keys are used to deterministically generate nullifiers and secrets for deposits and withdrawals.
-   * 
+   *
    * @throws {AccountError} If account initialization fails
    * @private
    */
@@ -64,11 +84,11 @@ export class AccountService {
       this.logger.debug("Initializing account with mnemonic");
 
       const masterNullifierSeed = bytesToNumber(
-        mnemonicToAccount(mnemonic, { accountIndex: 0 }).getHdKey().privateKey!,
+        mnemonicToAccount(mnemonic, { accountIndex: 0 }).getHdKey().privateKey!
       );
 
       const masterSecretSeed = bytesToNumber(
-        mnemonicToAccount(mnemonic, { accountIndex: 1 }).getHdKey().privateKey!,
+        mnemonicToAccount(mnemonic, { accountIndex: 1 }).getHdKey().privateKey!
       );
 
       const masterNullifier = poseidon([BigInt(masterNullifierSeed)]) as Secret;
@@ -78,7 +98,7 @@ export class AccountService {
         masterKeys: [masterNullifier, masterSecret],
         poolAccounts: new Map(),
         creationTimestamp: 0n,
-        lastUpdateTimestamp: 0n
+        lastUpdateTimestamp: 0n,
       };
     } catch (error) {
       throw AccountError.accountInitializationFailed(
@@ -89,7 +109,7 @@ export class AccountService {
 
   /**
    * Generates a deterministic nullifier for a deposit.
-   * 
+   *
    * @param scope - The scope of the pool
    * @param index - The index of the deposit
    * @returns A deterministic nullifier for the deposit
@@ -102,7 +122,7 @@ export class AccountService {
 
   /**
    * Generates a deterministic secret for a deposit.
-   * 
+   *
    * @param scope - The scope of the pool
    * @param index - The index of the deposit
    * @returns A deterministic secret for the deposit
@@ -115,7 +135,7 @@ export class AccountService {
 
   /**
    * Generates a deterministic nullifier for a withdrawal.
-   * 
+   *
    * @param label - The label of the commitment
    * @param index - The index of the withdrawal
    * @returns A deterministic nullifier for the withdrawal
@@ -128,7 +148,7 @@ export class AccountService {
 
   /**
    * Generates a deterministic secret for a withdrawal.
-   * 
+   *
    * @param label - The label of the commitment
    * @param index - The index of the withdrawal
    * @returns A deterministic secret for the withdrawal
@@ -141,7 +161,7 @@ export class AccountService {
 
   /**
    * Hashes a commitment using the Poseidon hash function.
-   * 
+   *
    * @param value - The value of the commitment
    * @param label - The label of the commitment
    * @param precommitment - The precommitment hash
@@ -151,14 +171,14 @@ export class AccountService {
   private _hashCommitment(
     value: bigint,
     label: Hash,
-    precommitment: Hash,
+    precommitment: Hash
   ): Hash {
     return poseidon([value, label, precommitment]) as Hash;
   }
 
   /**
    * Hashes a precommitment using the Poseidon hash function.
-   * 
+   *
    * @param nullifier - The nullifier for the commitment
    * @param secret - The secret for the commitment
    * @returns The precommitment hash
@@ -170,9 +190,9 @@ export class AccountService {
 
   /**
    * Gets all spendable commitments across all pools.
-   * 
+   *
    * @returns A map of scope to array of spendable commitments
-   * 
+   *
    * @remarks
    * A commitment is considered spendable if:
    * 1. It has a non-zero value
@@ -209,25 +229,29 @@ export class AccountService {
 
   /**
    * Creates nullifier and secret for a new deposit
-   * 
+   *
    * @param scope - The scope of the pool to deposit into
    * @param index - Optional index for deterministic generation
    * @returns The nullifier, secret, and precommitment for the deposit
-   * 
+   *
    * @remarks
    * If no index is provided, it uses the current number of accounts for the scope.
    * The precommitment is a hash of the nullifier and secret, used in the deposit process.
    */
   public createDepositSecrets(
     scope: Hash,
-    index?: bigint,
+    index?: bigint
   ): {
     nullifier: Secret;
     secret: Secret;
     precommitment: Hash;
   } {
+    if (index && index < 0n) {
+      throw AccountError.invalidIndex(index);
+    }
+
     const accounts = this.account.poolAccounts.get(scope);
-    index = index || BigInt(accounts?.length || 0);
+    index = index ?? BigInt(accounts?.length || 0);
 
     const nullifier = this._genDepositNullifier(scope, index);
     const secret = this._genDepositSecret(scope, index);
@@ -238,15 +262,15 @@ export class AccountService {
 
   /**
    * Creates nullifier and secret for spending a commitment
-   * 
+   *
    * @param commitment - The commitment to spend
    * @returns The nullifier and secret for the new commitment
-   * 
+   *
    * @remarks
    * The index used for generating the withdrawal nullifier and secret is based on
    * the number of children the account already has, ensuring each withdrawal has
    * a unique nullifier.
-   * 
+   *
    * @throws {AccountError} If no account is found for the commitment
    */
   public createWithdrawalSecrets(commitment: AccountCommitment): {
@@ -275,7 +299,7 @@ export class AccountService {
 
   /**
    * Adds a new pool account after depositing
-   * 
+   *
    * @param scope - The scope of the pool
    * @param value - The deposit value
    * @param nullifier - The nullifier used for the deposit
@@ -284,7 +308,7 @@ export class AccountService {
    * @param blockNumber - The block number of the deposit
    * @param txHash - The transaction hash of the deposit
    * @returns The new pool account
-   * 
+   *
    * @remarks
    * This method creates a new account with the deposit commitment and adds it to the
    * pool accounts map under the specified scope. The commitment hash is calculated
@@ -297,7 +321,7 @@ export class AccountService {
     secret: Secret,
     label: Hash,
     blockNumber: bigint,
-    txHash: Hex,
+    txHash: Hex
   ): PoolAccount {
     const precommitment = this._hashPrecommitment(nullifier, secret);
     const commitment = this._hashCommitment(value, label, precommitment);
@@ -323,7 +347,7 @@ export class AccountService {
     this.account.poolAccounts.get(scope)!.push(newAccount);
 
     this.logger.info(
-      `Added new pool account with value ${value} and label ${label}`,
+      `Added new pool account with value ${value} and label ${label}`
     );
 
     return newAccount;
@@ -331,7 +355,7 @@ export class AccountService {
 
   /**
    * Adds a new commitment to the account after spending
-   * 
+   *
    * @param parentCommitment - The commitment that was spent
    * @param value - The remaining value after spending
    * @param nullifier - The nullifier used for spending
@@ -339,12 +363,12 @@ export class AccountService {
    * @param blockNumber - The block number of the withdrawal
    * @param txHash - The transaction hash of the withdrawal
    * @returns The new commitment
-   * 
+   *
    * @remarks
    * This method finds the account containing the parent commitment, creates a new
    * commitment with the provided parameters, and adds it to the account's children.
    * The new commitment inherits the label from the parent commitment.
-   * 
+   *
    * @throws {AccountError} If no account is found for the commitment
    */
   public addWithdrawalCommitment(
@@ -353,7 +377,7 @@ export class AccountService {
     nullifier: Secret,
     secret: Secret,
     blockNumber: bigint,
-    txHash: Hex,
+    txHash: Hex
   ): AccountCommitment {
     let foundAccount: PoolAccount | undefined;
     let foundScope: bigint | undefined;
@@ -362,7 +386,7 @@ export class AccountService {
       foundAccount = accounts.find((account) => {
         if (account.deposit.hash === parentCommitment.hash) return true;
         return account.children.some(
-          (child) => child.hash === parentCommitment.hash,
+          (child) => child.hash === parentCommitment.hash
         );
       });
 
@@ -390,7 +414,7 @@ export class AccountService {
     foundAccount.children.push(newCommitment);
 
     this.logger.info(
-      `Added new commitment with value ${value} to account with label ${parentCommitment.label}`,
+      `Added new commitment with value ${value} to account with label ${parentCommitment.label}`
     );
 
     return newCommitment;
@@ -398,16 +422,16 @@ export class AccountService {
 
   /**
    * Adds a ragequit event to an existing pool account
-   * 
+   *
    * @param label - The label of the account to add the ragequit to
    * @param ragequit - The ragequit event to add
    * @returns The updated pool account
-   * 
+   *
    * @remarks
    * When an account has a ragequit event, it can no longer be spent.
    * This method finds the account with the matching label and attaches
    * the ragequit event to it.
-   * 
+   *
    * @throws {AccountError} If no account is found with the given label
    */
   public addRagequitToAccount(
@@ -444,19 +468,382 @@ export class AccountService {
   }
 
   /**
+   * Fetches deposit events for a given pool and returns a map of precommitments to their events for efficient lookup
+   *
+   * @param pool - The pool to fetch deposit events for
+   *
+   * @returns A map of precommitments to their events
+   */
+  public async getDepositEvents(
+    pool: PoolInfo
+  ): Promise<Map<Hash, DepositEvent>> {
+    try {
+      const depositEvents = await this.dataService.getDeposits(pool);
+
+      this.logger.info(`Found deposits for pool`, {
+        poolAddress: pool.address,
+        poolChainId: pool.chainId,
+        depositCount: depositEvents.length,
+      });
+
+      const depositMap = new Map<Hash, DepositEvent>();
+      for (const event of depositEvents) {
+        depositMap.set(event.precommitment, event);
+      }
+
+      return depositMap;
+    } catch (error) {
+      throw EventError.depositEventError(
+        pool.chainId,
+        pool.scope,
+        error as Error
+      );
+    }
+  }
+
+  /**
+   * Fetches withdrawal events for a given pool and returns a map of spent nullifiers to their events for efficient lookup
+   *
+   * @param pool - The pool to fetch withdrawal events for
+   *
+   * @returns A map of spent nullifiers to their events
+   */
+  public async getWithdrawalEvents(
+    pool: PoolInfo
+  ): Promise<Map<Hash, WithdrawalEvent>> {
+    try {
+      const withdrawalEvents = await this.dataService.getWithdrawals(pool);
+      const withdrawalMap = new Map<Hash, WithdrawalEvent>();
+      for (const event of withdrawalEvents) {
+        withdrawalMap.set(event.spentNullifier, event);
+      }
+
+      return withdrawalMap;
+    } catch (error) {
+      throw EventError.withdrawalEventError(
+        pool.chainId,
+        pool.scope,
+        error as Error
+      );
+    }
+  }
+
+  /**
+   * Fetches ragequit events for a given pool and returns a map of ragequit labels to their events for efficient lookup
+   *
+   * @param pool - The pool to fetch ragequit events for
+   *
+   * @returns A map of ragequit labels to their events
+   */
+  public async getRagequitEvents(
+    pool: PoolInfo
+  ): Promise<Map<Hash, RagequitEvent>> {
+    try {
+      const ragequitEvents = await this.dataService.getRagequits(pool);
+      const ragequitMap = new Map<Hash, RagequitEvent>();
+      for (const event of ragequitEvents) {
+        ragequitMap.set(event.label, event);
+      }
+
+      return ragequitMap;
+    } catch (error) {
+      throw EventError.ragequitEventError(
+        pool.chainId,
+        pool.scope,
+        error as Error
+      );
+    }
+  }
+
+  /**
+   * Fetches events for a given set of pools
+   *
+   * @param pools - The pools to fetch events for
+   *
+   * @returns A map of pool scopes to their events
+   */
+  public async getEvents(pools: PoolInfo[]): Promise<PoolEventsResult> {
+    const events: PoolEventsResult = new Map();
+
+    const poolEventResults = await Promise.allSettled(
+      pools.map(async (pool) => {
+        this.logger.info(`Fetching events for pool`, {
+          poolAddress: pool.address,
+          poolChainId: pool.chainId,
+          poolDeploymentBlock: pool.deploymentBlock,
+        });
+
+        const [depositEvents, withdrawalEvents, ragequitEvents] =
+          await Promise.all([
+            this.getDepositEvents(pool),
+            this.getWithdrawalEvents(pool),
+            this.getRagequitEvents(pool),
+          ]);
+
+        return {
+          scope: pool.scope,
+          depositEvents,
+          withdrawalEvents,
+          ragequitEvents,
+        };
+      })
+    );
+
+    for (const result of poolEventResults) {
+      if (result.status === "fulfilled") {
+        const { scope, depositEvents, withdrawalEvents, ragequitEvents } =
+          result.value;
+        events.set(scope, {
+          depositEvents,
+          withdrawalEvents,
+          ragequitEvents,
+        });
+      } else {
+        events.set(result.reason.details?.scope as Hash, {
+          reason: result.reason.message,
+          scope: result.reason.details?.scope as Hash,
+        });
+      }
+    }
+
+    return events;
+  }
+
+  /**
+   * Processes deposit events for a given scope and adds them to the account
+   * Deterministically generate deposit secrets and check if they match on-chain deposits
+   *
+   * @param scope - The scope of the pool
+   * @param depositEvents - The map of deposit events
+   *
+   */
+  private _processDepositEvents(
+    scope: Hash,
+    depositEvents: Map<Hash, DepositEvent>
+  ): void {
+    for (let index = BigInt(0); index < depositEvents.size; index++) {
+      // Generate nullifier, secret, and precommitment for this index
+      const { nullifier, secret, precommitment } = this.createDepositSecrets(
+        scope,
+        index
+      );
+
+      // Look for a deposit with this precommitment
+      const event = depositEvents.get(precommitment);
+
+      if (!event) {
+        break; // No more deposits found, exit the loop
+      }
+
+      // Create a new pool account for this deposit
+      this.addPoolAccount(
+        scope,
+        event.value,
+        nullifier,
+        secret,
+        event.label,
+        event.blockNumber,
+        event.transactionHash
+      );
+    }
+  }
+
+  /**
+   * Processes withdrawal events for a given scope and adds them to the account
+   *
+   * @param scope - The scope of the pool
+   * @param withdrawalEvents - The map of withdrawal events
+   *
+   * @remarks
+   * This method performs the following steps for each pool:
+   * 1. Identifies the earliest deposit block for each scope
+   * 2. For each account, reconstructs the withdrawal history by:
+   *    - Generating nullifiers sequentially
+   *    - Matching them against on-chain events
+   *    - Adding matched withdrawals to the account state
+   *
+   * @throws {DataError} If event fetching fails
+   * @private
+   *
+   */
+  private _processWithdrawalEvents(
+    scope: Hash,
+    withdrawalEvents: Map<Hash, WithdrawalEvent>
+  ): void {
+    const accounts = this.account.poolAccounts.get(scope);
+
+    // Skip if no accounts for this scope
+    if (!accounts || accounts.length === 0) {
+      this.logger.info(`No accounts found for pool with this scope`, {
+        scope,
+      });
+
+      return;
+    }
+
+    // Process each account in parallel for better performance
+    for (const account of accounts) {
+      let currentCommitment = account.deposit;
+      let index = BigInt(0);
+
+      // Continue processing withdrawals until no more are found secuentially
+      while (true) {
+        // Generate nullifier for this withdrawal
+        const nullifierHash = poseidon([currentCommitment.nullifier]) as Hash;
+
+        // Look for a withdrawal event with this nullifier
+        const withdrawal = withdrawalEvents.get(nullifierHash);
+        if (!withdrawal) {
+          break;
+        }
+
+        // Generate secret for this withdrawal
+        const nullifier = this._genWithdrawalNullifier(account.label, index);
+        const secret = this._genWithdrawalSecret(account.label, index);
+
+        // Add the withdrawal commitment to the account
+        const newCommitment = this.addWithdrawalCommitment(
+          currentCommitment,
+          currentCommitment.value - withdrawal.withdrawn,
+          nullifier,
+          secret,
+          withdrawal.blockNumber,
+          withdrawal.transactionHash
+        );
+
+        // Update current commitment to the newly created one
+        currentCommitment = newCommitment;
+
+        // Increment index for next potential withdrawal
+        index++;
+      }
+    }
+  }
+
+  /**
+   * Processes ragequit events for a given scope and adds them to the account
+   *
+   * @param scope - The scope of the pool
+   * @param ragequitEvents - The map of ragequit events
+   *
+   * @remarks
+   * This method performs the following steps for each pool:
+   * 1. Adds ragequit events to accounts if found
+   *
+   * @throws {DataError} If event fetching fails
+   * @private
+   *
+   */
+  private _processRagequitEvents(
+    scope: Hash,
+    ragequitEvents: Map<Hash, RagequitEvent>
+  ): void {
+    const accounts = this.account.poolAccounts.get(scope);
+
+    if (!accounts || accounts.length === 0) {
+      this.logger.info(`No accounts found for pool with this scope`, {
+        scope,
+      });
+
+      return;
+    }
+
+    for (const account of accounts) {
+      const ragequit = ragequitEvents.get(account.label);
+      if (ragequit) {
+        this.addRagequitToAccount(account.label, ragequit);
+      }
+    }
+  }
+
+  /**
+   * Initializes an AccountService instance with events for a given set of pools
+   *
+   * @param dataService - The data service to use for fetching events
+   * @param source - The source to use for initializing the account. Either a mnemonic or an existing account service instance
+   * @param pools - The pools to fetch events for
+   *
+   * @remarks
+   * This method performs the following steps for each pool:
+   * 1. Fetches deposit, withdrawal, and ragequit events for each pool
+   * 2. Processes deposit events and creates pool accounts
+   * 3. Processes withdrawal events and adds commitments to pool accounts
+   * 4. Processes ragequit events and adds ragequit to pool accounts
+   *
+   * @returns The initialized AccountService instance and array of errors if any pool events fetching fails
+   *
+   * if any pool events fetching fails, the account will be initialized without the events for that pool
+   * user can then call to this method again with the same account and missing pools to fetch the missing events
+   *
+   * @throws {AccountError} If account state reconstruction fails or if duplicate pools are found
+   */
+  static async initializeWithEvents(
+    dataService: DataService,
+    source:
+      | {
+        mnemonic: string;
+      }
+      | {
+        service: AccountService;
+      },
+    pools: PoolInfo[]
+  ): Promise<{ account: AccountService; errors: PoolEventsError[] }> {
+    // Log the start of the history retrieval process
+    const logger = new Logger({ prefix: "Account" });
+    logger.info(`Fetching events for pools`, { poolLength: pools.length });
+
+    // verify that pools don't contain duplicates based on scope
+    const uniqueScopes = new Set<bigint>();
+    for (const pool of pools) {
+      if (uniqueScopes.has(pool.scope)) {
+        throw AccountError.duplicatePools(pool.scope);
+      }
+      uniqueScopes.add(pool.scope);
+    }
+
+    const errors: PoolEventsError[] = [];
+    const account = new AccountService(
+      dataService,
+      "mnemonic" in source
+        ? { mnemonic: source.mnemonic }
+        : { account: source.service.account }
+    );
+
+    const events = await account.getEvents(pools);
+
+    for (const [scope, result] of events.entries()) {
+      if ("reason" in result) {
+        errors.push(result);
+      } else {
+        // Process deposit events an create pool accounts
+        account._processDepositEvents(scope, result.depositEvents);
+
+        // Process withdrawal events and add commitments to pool accounts
+        account._processWithdrawalEvents(scope, result.withdrawalEvents);
+
+        // Process ragequit events and add ragequit to pool accounts
+        account._processRagequitEvents(scope, result.ragequitEvents);
+      }
+    }
+
+    return { account, errors };
+  }
+
+  /**
+   * @deprecated Use `initializeWithEvents` for instantiating an account with history reconstruction
    * Retrieves the history of deposits and withdrawals for the given pools.
-   * 
+   *
    * @param pools - Array of pool configurations to sync history for
-   * 
+   *
    * @remarks
    * This method performs the following steps:
    * 1. Initializes pool accounts for each pool if they don't exist
    * 2. For each pool, fetches deposit events and reconstructs accounts
    * 3. Processes withdrawals and ragequits to update account state
-   * 
+   *
    * The account reconstruction is deterministic based on the master keys,
    * allowing the full state to be recovered from on-chain events.
-   * 
+   *
    * @throws {DataError} If event fetching fails
    * @throws {AccountError} If account state reconstruction fails
    */
@@ -476,14 +863,14 @@ export class AccountService {
       pools.map(async (pool) => {
         // Log which pool is being processed
         this.logger.info(
-          `Processing pool ${pool.address} on chain ${pool.chainId} from block ${pool.deploymentBlock}`,
+          `Processing pool ${pool.address} on chain ${pool.chainId} from block ${pool.deploymentBlock}`
         );
 
         // Fetch all deposit events for this pool
         const deposits = await this.dataService.getDeposits(pool);
 
         this.logger.info(
-          `Found ${deposits.length} deposits for pool ${pool.address}`,
+          `Found ${deposits.length} deposits for pool ${pool.address}`
         );
 
         // Create a map of deposits by precommitment for efficient lookup
@@ -531,7 +918,7 @@ export class AccountService {
             secret,
             deposit.label,
             deposit.blockNumber,
-            deposit.transactionHash,
+            deposit.transactionHash
           );
 
           // Track the found deposit
@@ -544,13 +931,13 @@ export class AccountService {
         // If no accounts were found for this scope, log and skip further processing
         if (this.account.poolAccounts.get(pool.scope)!.length === 0) {
           this.logger.info(
-            `No Pool Accounts were found for scope ${pool.scope}`,
+            `No Pool Accounts were found for scope ${pool.scope}`
           );
           return;
         }
 
         this.logger.info(
-          `Found ${foundDeposits.length} deposits for pool ${pool.address}`,
+          `Found ${foundDeposits.length} deposits for pool ${pool.address}`
         );
       })
     );
@@ -562,9 +949,9 @@ export class AccountService {
 
   /**
    * Processes withdrawal events for all pools and updates account state.
-   * 
+   *
    * @param pools - Array of pool configurations to process withdrawals for
-   * 
+   *
    * @remarks
    * This method performs the following steps for each pool:
    * 1. Identifies the earliest deposit block for each scope
@@ -575,7 +962,7 @@ export class AccountService {
    *    - Matching them against on-chain events
    *    - Adding matched withdrawals to the account state
    * 5. Adds ragequit events to accounts if found
-   * 
+   *
    * @throws {DataError} If event fetching fails
    * @private
    */
@@ -603,8 +990,14 @@ export class AccountService {
         }
 
         // Fetch withdrawal and ragequit events from the first deposit block
-        const withdrawals = await this.dataService.getWithdrawals(pool, firstDepositBlock);
-        const ragequits = await this.dataService.getRagequits(pool, firstDepositBlock);
+        const withdrawals = await this.dataService.getWithdrawals(
+          pool,
+          firstDepositBlock
+        );
+        const ragequits = await this.dataService.getRagequits(
+          pool,
+          firstDepositBlock
+        );
 
         this.logger.info(
           `Found ${withdrawals.length} withdrawals for pool ${pool.address}`
@@ -634,7 +1027,9 @@ export class AccountService {
           // Continue processing withdrawals until no more are found
           while (true) {
             // Generate nullifier for this withdrawal
-            const nullifierHash = poseidon([currentCommitment.nullifier]) as Hash;
+            const nullifierHash = poseidon([
+              currentCommitment.nullifier,
+            ]) as Hash;
 
             // Look for a withdrawal event with this nullifier
             const withdrawal = withdrawalMap.get(nullifierHash);
@@ -643,7 +1038,10 @@ export class AccountService {
             }
 
             // Generate secret for this withdrawal
-            const nullifier = this._genWithdrawalNullifier(account.label, index);
+            const nullifier = this._genWithdrawalNullifier(
+              account.label,
+              index
+            );
             const secret = this._genWithdrawalSecret(account.label, index);
 
             // Add the withdrawal commitment to the account
@@ -671,5 +1069,4 @@ export class AccountService {
       })
     );
   }
-
 }