@fatsolutions/privacy-pools-core-starknet-sdk 0.0.42 → 0.0.43

package/src/contracts/contracts.service.ts

@@ -8,7 +8,7 @@ import { ETH_ADDRESS } from "../constants.js";
 import { SNContractError, SNPoolError, StarknetSDKError } from "../errors/index.js";
 import { AssetConfig, Withdrawal } from "../types/entrypoint.js";
 import { StarknetAddress } from "../types/starknet.js";
-import { castBigInt, toAddress, toCairoOption } from "../utils.js";
+import { castBigInt, toAddress } from "../utils.js";
 import { executeIntent, simulateIntent } from "./transactionHandler.js";
 
 /**
@@ -251,9 +251,8 @@ export class SNContractInteractionsService {
    */
   withdraw(withdrawal: Withdrawal, withdrawalProofGaraga: bigint[], scope: Hash, options: OptionModeExecute): Promise<InvokeFunctionResponse>;
   async withdraw(withdrawal: Withdrawal, withdrawalProofGaraga: bigint[], scope: Hash, options?: OptionModes): Promise<CallResult> {
-    const _withdrawal = { ...withdrawal, auditorData: toCairoOption(withdrawal.auditorData) };
     const { poolAddress } = await this.getScopeData(scope);
-    const call = this.pool(poolAddress).populate("withdraw", [_withdrawal, { fullProof: withdrawalProofGaraga }]);
+    const call = this.pool(poolAddress).populate("withdraw", [withdrawal, { fullProof: withdrawalProofGaraga }]);
     return _intentOptionWrapper(call, options && { ...options, account: this.providerOrAccount });
   }
 
@@ -287,8 +286,7 @@ export class SNContractInteractionsService {
    */
   relay(withdrawal: Withdrawal, withdrawalProofGaraga: bigint[], scope: Hash, options: OptionModeExecute): Promise<InvokeFunctionResponse>;
   relay(withdrawal: Withdrawal, withdrawalProofGaraga: bigint[], scope: Hash, options?: OptionModes): Promise<CallResult> {
-    const _withdrawal = { ...withdrawal, auditorData: toCairoOption(withdrawal.auditorData) };
-    const call = this.entrypoint.populate("relay", [_withdrawal, scope, { fullProof: withdrawalProofGaraga }]);
+    const call = this.entrypoint.populate("relay", [withdrawal, scope, { fullProof: withdrawalProofGaraga }]);
     return _intentOptionWrapper(call, options && { ...options, account: this.providerOrAccount });
   }
 

package/src/data.service.ts

@@ -5,7 +5,6 @@ import {
   RagequitEvent,
   WithdrawalEvent,
 } from "@0xbow/privacy-pools-core-sdk";
-import { AuditEvent } from "./auditor.js"
 import {
   AbiParser2,
   EmittedEvent,
@@ -22,7 +21,6 @@ import {
   StarknetSDKError,
 } from "./errors/index.js";
 
-
 // Calculate event selectors using Starknet keccak
 export const DEPOSIT_EVENT_SELECTOR = num.toHex(
   hash.starknetKeccak("Deposited")
@@ -34,21 +32,15 @@ export const RAGEQUIT_EVENT_SELECTOR = num.toHex(
   hash.starknetKeccak("RageQuit")
 ); // 0x2a2469e4569da9d3c3df9bc1a2ddece1e640a89b8ecd537da96f064d64c8183
 
-export const AUDIT_EVENT_SELECTOR = num.toHex(
-  hash.starknetKeccak("AuditEvent")
-);
-
 // ABI event names for direct selection
 export const DEPOSIT_EVENT_ABI_NAME = "privacy_pools::interfaces::IPool::Deposited";
 export const WITHDRAWAL_EVENT_ABI_NAME = "privacy_pools::interfaces::IPool::Withdrawn";
 export const RAGEQUIT_EVENT_ABI_NAME = "privacy_pools::interfaces::IPool::RageQuit";
-export const AUDIT_EVENT_ABI_NAME = "privacy_pools::interfaces::IPool::AuditEvent";
 
 export const AbiEventName = {
   Deposit: DEPOSIT_EVENT_ABI_NAME,
   Withdraw: WITHDRAWAL_EVENT_ABI_NAME,
   Ragequit: RAGEQUIT_EVENT_ABI_NAME,
-  Audit: AUDIT_EVENT_ABI_NAME,
 } as const;
 
 type AbiEventName = (typeof AbiEventName)[keyof typeof AbiEventName];
@@ -67,7 +59,6 @@ export interface StarknetWithdrawnEventData {
   newCommitmentHash: bigint;
   withdrawnValue: bigint;
   existingNullifierHash: bigint;
-  auditorData: string;
 }
 
 export interface StarknetRageQuitEventData {
@@ -77,24 +68,15 @@ export interface StarknetRageQuitEventData {
   value: bigint;
 }
 
-export interface StarknetAuditEventData {
-    tag: bigint;
-    ciphertext:string;
-    prevNullifierHash: bigint,
-    newCommitment: bigint,
-}
-
 type AbiToEvent = {
   [AbiEventName.Deposit]: StarknetDepositedEventData;
   [AbiEventName.Withdraw]: StarknetWithdrawnEventData;
   [AbiEventName.Ragequit]: StarknetRageQuitEventData;
-  [AbiEventName.Audit]: StarknetAuditEventData;
 };
 
 export type StarknetEvent =
   | StarknetDepositedEventData
   | StarknetWithdrawnEventData
-  | StarknetAuditEventData
   | StarknetRageQuitEventData;
 
 /**
@@ -141,17 +123,15 @@ export class StarknetDataService {
    */
   async getDeposits(
     pool: PoolInfo,
-    fromBlock: bigint = pool.deploymentBlock,
-    label?: bigint,
+    fromBlock: bigint = pool.deploymentBlock
   ): Promise<DepositEvent[]> {
     try {
-      const keys = label? [[DEPOSIT_EVENT_SELECTOR],[],[String(label)]] : [[DEPOSIT_EVENT_SELECTOR]];
       // Fetch events using Starknet provider
       const eventsResult = await this.getEvents({
         from_block: { block_number: Number(fromBlock) },
         to_block: "latest",
         address: pool.address,
-        keys, // Filter by deposit event selector
+        keys: [[DEPOSIT_EVENT_SELECTOR]], // Filter by deposit event selector
         chunk_size: 1000, // Starknet pagination
       });
 
@@ -313,63 +293,6 @@ export class StarknetDataService {
             transactionHash: transactionHash || "0x0",
           } as RagequitEvent)
         );
-        // PARSEAR
-    } catch (error) {
-      if (error instanceof StarknetSDKError) throw error;
-      throw new StarknetSDKError(
-        `Failed to fetch ragequits: ${error instanceof Error ? error.message : "Unknown error"
-        }`,
-        SNBaseErrorCode.UNKNOWN
-      );
-    }
-  }
-
-  async getAuditEventForTag(
-    tag: bigint,
-    pool: PoolInfo,
-    fromBlock: bigint = pool.deploymentBlock
-  ) {
-    try {
-      const eventsResult = await this.getEvents({
-        from_block: { block_number: Number(fromBlock) },
-        to_block: "latest",
-        address: pool.address,
-        keys: [[AUDIT_EVENT_SELECTOR], [String(tag)]],
-        chunk_size: 1000,
-      });
-
-      // Parse all events at once using starknet.js event parser
-      const abiEvents = events.getAbiEvents(PrivacyPoolABI);
-      const parsedEvents = events.parseEvents(
-        eventsResult,
-        abiEvents,
-        {},
-        {},
-        this.abiParser
-      );
-
-      return parsedEvents
-        .filter(
-          (parsedEvent) => parsedEvent[AUDIT_EVENT_ABI_NAME] !== undefined
-        )
-        .map((parsedEvent) => ({
-          eventData: parsedEvent[
-            AUDIT_EVENT_ABI_NAME
-          ] as unknown as StarknetAuditEventData,
-          blockNumber: parsedEvent.block_number,
-          transactionHash: parsedEvent.transaction_hash,
-        }))
-        .map(
-          ({ eventData, blockNumber, transactionHash }) =>
-          ({
-            tag: eventData.tag as Hash,
-            ciphertext: eventData.ciphertext,
-            prevNullifierHash: eventData.prevNullifierHash as Hash,
-            newCommitment: eventData.newCommitment as Hash,
-            blockNumber: BigInt(blockNumber || 0),
-            transactionHash: transactionHash || "0x0",
-          } as AuditEvent)
-        );
     } catch (error) {
       if (error instanceof StarknetSDKError) throw error;
       throw new StarknetSDKError(

package/src/index.ts

@@ -85,8 +85,3 @@ export {
 } from "./data.service.js";
 
 export { type StarknetAddress } from "./types/starknet.js";
-
-// Auditor
-export * from "./auditor.js";
-
-export * from './account.service.js';

package/src/types/entrypoint.ts

@@ -1,9 +1,8 @@
-import { BigNumberish, cairo, CallData, num, CairoOption, byteArray } from "starknet";
+import { BigNumberish, cairo, CallData, num } from "starknet";
 
 import { EntryPointABI } from "../abis/index.js";
 import { SNFormatError } from "../errors/index.js";
 import { StarknetAddress } from "./starknet.js";
-import { AuditorData } from "../auditor.js";
 
 const RelayDataAbi = [
   {
@@ -47,7 +46,6 @@ const entrypointCd = new CallData(EntryPointABI);
 export interface Withdrawal {
   /** The address of the processor handling this withdrawal */
   processor: BigNumberish,
-  auditorData?: AuditorData;
   /** Additional data required for processing the withdrawal */
   data: BigNumberish[];
 }
@@ -115,48 +113,18 @@ export function parseRelayData(rawData: string[]): RelayData {
  * @returns Array of string representations of the withdrawal fields
  */
 export function serializeWithdrawal(withdrawal: Withdrawal): `0x${string}`[] {
-  let result: `0x${string}`[] = [];
-  const { processor, auditorData, data } = withdrawal;
-
-  result.push(num.toHex64(processor) as `0x${string}`);
-
-  if (auditorData === undefined) {
-    result.push(num.toHex64(1) as `0x${string}`);
-  } else {
-    result.push(num.toHex64(0) as `0x${string}`);
-    const { tag, ciphertext } = auditorData;
-    const { low, high } = cairo.uint256(tag);
-    result.push(num.toHex64(low) as `0x${string}`);
-    result.push(num.toHex64(high) as `0x${string}`);
-
-    const array = CallData.compile([byteArray.byteArrayFromString(ciphertext)]);
-    array.forEach((x) => result.push(num.toHex64(x) as `0x${string}`));
-  }
-
-  result.push(num.toHex64(data.length) as `0x${string}`);
-  data.forEach((x) => result.push(num.toHex64(x) as `0x${string}`));
-  return result;
+  const { processor, data } = withdrawal;
+  return [
+    num.toHex64(processor) as `0x${string}`,
+    num.toHex64(data.length) as `0x${string}`,
+    ...data.map(x => num.toHex64(x) as `0x${string}`)
+  ];
 }
 
-type CairoWithdrawal = {
-  processor: BigNumberish;
-  data: BigNumberish[];
-  auditorData: CairoOption<AuditorData>;
-};
-function isWithdrawal(data: unknown): data is CairoWithdrawal {
-  const _data = data as CairoWithdrawal;
-  return (
-    _data.processor !== undefined &&
-    num.isBigNumberish(_data.processor)
-  ) && (
-      _data.data !== undefined &&
-      _data.data.every(num.isBigNumberish)
-    ) && (
-      (
-        _data.auditorData.Some?.ciphertext !== undefined &&
-        _data.auditorData.Some?.tag !== undefined
-      ) || _data.auditorData.None !== undefined
-    );
+function isWithdrawal(data: unknown): data is Withdrawal {
+  const _data = data as Withdrawal;
+  return (_data.processor !== undefined && num.isBigNumberish(_data.processor))
+    && (_data.data !== undefined && _data.data.every(num.isBigNumberish));
 }
 
 /**
@@ -172,8 +140,7 @@ export function parseWithdrawal(rawData: string[]): Withdrawal {
   }
   const structName = "privacy_pools::interfaces::Structs::Withdrawal";
   const result = entrypointCd.decodeParameters(structName, rawData);
-  if (isWithdrawal(result)) {
-    return { ...result, auditorData: result.auditorData.unwrap() };
-  }
+  if (isWithdrawal(result))
+    return result;
   throw SNFormatError.parse(`Can't parse Withdrawal from ${rawData}`);
 }

package/src/utils.ts

@@ -1,6 +1,6 @@
 import { WithdrawalProof } from "@0xbow/privacy-pools-core-sdk";
 import { poseidonHashMany } from "@scure/starknet";
-import { BigNumberish, cairo, CairoOption, CairoOptionVariant, num, uint256, Uint256, validateAndParseAddress, validateChecksumAddress } from "starknet";
+import { BigNumberish, cairo, num, uint256, Uint256, validateAndParseAddress, validateChecksumAddress } from "starknet";
 
 import { getGroth16CallData } from "./garaga.js";
 import { snarkJsKeyIntoGaraga, snarkJsProofIntoGaraga } from "./types/conversions.js";
@@ -94,15 +94,3 @@ export function castBigInt(x: number | bigint | Uint256) {
 export function toAddress(x: BigNumberish): StarknetAddress {
   return validateAndParseAddress(x) as StarknetAddress;
 }
-
-export const Some = <T>(t: T): CairoOption<T> => {
-  return new CairoOption<T>(CairoOptionVariant.Some, t);
-};
-
-export const None = <T>(): CairoOption<T> => {
-  return new CairoOption<T>(CairoOptionVariant.None);
-};
-
-export const toCairoOption = <T>(t?: T): CairoOption<T> => {
-  return t === undefined ? None() : Some(t);
-};

package/dist/account.service.d.ts

@@ -1,15 +0,0 @@
-import { AccountService, PoolAccount } from "@0xbow/privacy-pools-core-sdk";
-import { StarknetDataService } from "./data.service.js";
-import { AuditorData } from "./auditor.js";
-type AccountServiceConfig = Exclude<ConstructorParameters<typeof AccountService>[1], {
-    account: any;
-}>;
-export declare class StarknetAccountService extends AccountService {
-    private mnemonic;
-    constructor(dataService: StarknetDataService, config: AccountServiceConfig);
-    createAuditorData({ label, deposit, children }: PoolAccount, withdrawalValue?: bigint): {
-        auditorData: AuditorData;
-        withdrawalSecrets: ReturnType<StarknetAccountService['createWithdrawalSecrets']>;
-    };
-}
-export {};

package/dist/account.service.js

@@ -1,27 +0,0 @@
-import { AccountService } from "@0xbow/privacy-pools-core-sdk";
-import { deriveKeyFromMnemonic, packAuditorData, computeTag, encrypt } from "./auditor.js";
-import { base64 } from "@scure/base";
-export class StarknetAccountService extends AccountService {
-    mnemonic;
-    constructor(dataService, config) {
-        super(dataService, config);
-        this.mnemonic = config.mnemonic;
-    }
-    createAuditorData({ label, deposit, children }, withdrawalValue) {
-        const viewKey = deriveKeyFromMnemonic(this.mnemonic, label);
-        const accountCommitment = children.at(-1) || deposit;
-        const withdrawalIndex = children.length;
-        const withdrawalSecrets = this.createWithdrawalSecrets(accountCommitment);
-        const packedData = packAuditorData({
-            value: withdrawalValue || accountCommitment.value,
-            label,
-            ...withdrawalSecrets,
-        });
-        const cipherArray = encrypt(packedData, viewKey);
-        const ciphertext = base64.encode(cipherArray);
-        const tag = computeTag(viewKey, withdrawalIndex);
-        const auditorData = { tag, ciphertext };
-        return { auditorData, withdrawalSecrets };
-    }
-}
-//# sourceMappingURL=account.service.js.map

package/dist/account.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"account.service.js","sourceRoot":"","sources":["../src/account.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAe,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAe,qBAAqB,EAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvG,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAIpC,MAAM,OAAO,sBAAuB,SAAQ,cAAc;IAC9C,QAAQ,CAAS;IACzB,YAAY,WAAgC,EAAE,MAA4B;QACtE,KAAK,CAAC,WAAoB,EAAE,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACpC,CAAC;IAED,iBAAiB,CACb,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAe,EACzC,eAAwB;QAKxB,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,iBAAiB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;QACrD,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC;QAExC,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;QAE1E,MAAM,UAAU,GAAG,eAAe,CAAC;YAC/B,KAAK,EAAE,eAAe,IAAI,iBAAiB,CAAC,KAAK;YACjD,KAAK;YACL,GAAG,iBAAiB;SACvB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAE9C,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACjD,MAAM,WAAW,GAAgB,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;QACrD,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;IAC9C,CAAC;CACJ"}

package/dist/auditor.d.ts

@@ -1,31 +0,0 @@
-import { AccountCommitment, Hash, PoolInfo } from "@0xbow/privacy-pools-core-sdk";
-import { StarknetDataService } from "./data.service.js";
-export interface AuditEvent {
-    tag: Hash;
-    ciphertext: string;
-    prevNullifierHash: Hash;
-    newCommitment: Hash;
-    blockNumber: bigint;
-    transactionHash: string;
-}
-export declare function deriveKey(secret: Uint8Array, label: bigint): Uint8Array;
-export declare function deriveKeyFromMnemonic(mnemonic: string, label: bigint): Uint8Array;
-export declare function encrypt(plaintext: Uint8Array, viewKey: Uint8Array): Uint8Array<ArrayBuffer>;
-export declare function decrypt(input: Uint8Array, viewKey: Uint8Array): Uint8Array;
-export declare function packAuditorData({ label: declaredLabel, value: declaredValue, nullifier: declaredNullifier, secret: declaredSecret }: Pick<AccountCommitment, 'label' | 'value' | 'nullifier' | 'secret'>): Uint8Array;
-export declare function unpackAuditorData(packedData: Uint8Array): {
-    declaredLabel: bigint;
-    declaredValue: bigint;
-    declaredNullifier: bigint;
-    declaredSecret: bigint;
-};
-export declare function reconstructAccountCommitment(event: AuditEvent, viewKey: Uint8Array): AccountCommitment;
-export declare function computeTag(viewKey: Uint8Array, withdraw_number: number): bigint;
-export declare function constructSequence(viewKey: Uint8Array, serviceData: StarknetDataService, pool: PoolInfo): Promise<AccountCommitment[]>;
-/**
- * Represents a AuditEvent event from a privacy pool
- */
-export interface AuditorData {
-    tag: bigint;
-    ciphertext: string;
-}

package/dist/auditor.js

@@ -1,148 +0,0 @@
-import { xchacha20poly1305 } from "@noble/ciphers/chacha.js";
-import { hkdf } from "@noble/hashes/hkdf.js";
-import { sha3_256 as sha256 } from "@noble/hashes/sha3.js";
-import { bytesToNumberBE, numberToBytesBE } from "@noble/ciphers/utils.js";
-import { getCommitment } from "@0xbow/privacy-pools-core-sdk";
-import { poseidonHashMany } from "@scure/starknet";
-import { base64 } from "@scure/base";
-import { mnemonicToEntropy } from "@scure/bip39";
-import { wordlist } from '@scure/bip39/wordlists/english';
-//TODO: The first time you will need to generate a viewing key is in the first withdraw
-// of a deposited note. At that point you allready have a label. I suggest for the viewKey to be derivable
-// from the account secret + deposit label. There is no need to store another secret for each deposit.
-// viewKey =~ Hash(AccountSecret, Label);
-export function deriveKey(secret, label) {
-    const info = new TextEncoder().encode("xchacha-key");
-    const salt = new TextEncoder().encode(String(label));
-    const viewKey = hkdf(sha256, secret, salt, info, 32);
-    return viewKey;
-}
-export function deriveKeyFromMnemonic(mnemonic, label) {
-    const secret = mnemonicToEntropy(mnemonic, wordlist);
-    return deriveKey(secret, label);
-}
-export function encrypt(plaintext, viewKey) {
-    const nonce = crypto.getRandomValues(new Uint8Array(24));
-    const chacha = xchacha20poly1305(viewKey, nonce);
-    const ciphertext = chacha.encrypt(plaintext);
-    // Prepend the nonce
-    const output = new Uint8Array(24 + ciphertext.length);
-    output.set(nonce, 0);
-    output.set(ciphertext, 24);
-    return output;
-}
-export function decrypt(input, viewKey) {
-    const nonce = input.slice(0, 24);
-    const chacha = xchacha20poly1305(viewKey, nonce);
-    const ciphertext = input.slice(24);
-    //TODO: What happens if AE fails?
-    const decrypted = chacha.decrypt(ciphertext);
-    return decrypted;
-}
-export function packAuditorData({ label: declaredLabel, value: declaredValue, nullifier: declaredNullifier, secret: declaredSecret }) {
-    //TODO: Add assertions about lenght of bigint
-    const output = new Uint8Array(128);
-    output.set(numberToBytesBE(declaredLabel, 32), 0);
-    output.set(numberToBytesBE(declaredValue, 32), 32);
-    output.set(numberToBytesBE(declaredNullifier, 32), 64);
-    output.set(numberToBytesBE(declaredSecret, 32), 96);
-    return output;
-}
-export function unpackAuditorData(packedData) {
-    const declaredLabel = bytesToNumberBE(packedData.slice(0, 32));
-    const declaredValue = bytesToNumberBE(packedData.slice(32, 64));
-    const declaredNullifier = bytesToNumberBE(packedData.slice(64, 96));
-    const declaredSecret = bytesToNumberBE(packedData.slice(96, 128));
-    return { declaredLabel, declaredValue, declaredNullifier, declaredSecret };
-}
-export function reconstructAccountCommitment(event, viewKey) {
-    const { ciphertext, blockNumber, transactionHash, prevNullifierHash } = event;
-    const auditorData = decrypt(base64.decode(ciphertext), viewKey);
-    const { declaredLabel, declaredValue, declaredNullifier, declaredSecret } = unpackAuditorData(auditorData);
-    const { hash, nullifierHash, preimage: { value: _value, label, precommitment: _precommitment } } = getCommitment(declaredValue, declaredLabel, declaredNullifier, declaredSecret);
-    if (nullifierHash != prevNullifierHash) {
-        throw new Error("Inconsistency in emitted nullifier hash");
-    }
-    return {
-        hash,
-        value: declaredValue,
-        label: label,
-        nullifier: declaredNullifier,
-        secret: declaredSecret,
-        blockNumber,
-        txHash: transactionHash,
-    };
-}
-export function computeTag(viewKey, withdraw_number) {
-    const viewKeyBigInt = bytesToNumberBE(viewKey);
-    const tag = poseidonHashMany([viewKeyBigInt, BigInt(withdraw_number)]);
-    return tag;
-}
-;
-async function fetchAuditEventsForViewKey(viewKey, serviceData, pool) {
-    let out = [];
-    let withdraw_number = 0;
-    while (true) {
-        let tag = computeTag(viewKey, withdraw_number);
-        let events = await serviceData.getAuditEventForTag(tag, pool);
-        if (!events) {
-            break;
-        }
-        ;
-        //It should be only ONE event with this tag. But it is not eforced. A troll could make a withdraw with 
-        //the tag of a previous withraw from another label.
-        events.forEach(event => out.push([event, withdraw_number]));
-        withdraw_number++;
-    }
-    return out;
-}
-export async function constructSequence(viewKey, serviceData, pool) {
-    const commitments = [];
-    const events = await fetchAuditEventsForViewKey(viewKey, serviceData, pool);
-    const events_for_index = events.filter(([_, b]) => b === 0);
-    if (events_for_index.length === 0) {
-        throw new Error("No withdraws for this key");
-    }
-    let declaredCommitment;
-    for (const [event, _withdraw_number] of events_for_index) {
-        try {
-            declaredCommitment = reconstructAccountCommitment(event, viewKey);
-        }
-        catch {
-            //What should we do here?
-        }
-    }
-    if (!declaredCommitment) {
-        throw new Error("No event could be decrypted");
-    }
-    let initialLabel = declaredCommitment.label;
-    let deposit = await serviceData.getDeposits(pool, pool.deploymentBlock, initialLabel);
-    if (deposit.length != 1) {
-        throw new Error("No deposit found for this label");
-    }
-    let initialCommitment = deposit[0].commitment;
-    if (initialCommitment != declaredCommitment.hash) {
-        throw new Error("mismatch");
-    }
-    commitments.push(declaredCommitment);
-    for (let i = 1; i < events.length; i++) {
-        let events_for_index = events.filter(([_, b]) => b === i);
-        for (const [event, _withdraw_number] of events_for_index) {
-            try {
-                declaredCommitment = reconstructAccountCommitment(event, viewKey);
-            }
-            catch {
-                //What should we do here?
-            }
-        }
-        if (initialLabel != declaredCommitment.label) {
-            throw new Error("mismatch");
-        }
-        if (commitments[i - 1].hash != declaredCommitment.hash) {
-            throw new Error("mismatch");
-        }
-        commitments.push(declaredCommitment);
-    }
-    return commitments;
-}
-//# sourceMappingURL=auditor.js.map

package/dist/auditor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"auditor.js","sourceRoot":"","sources":["../src/auditor.ts"],"names":[],"mappings":"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"}

package/src/account.service.ts

@@ -1,42 +0,0 @@
-import { AccountService, PoolAccount } from "@0xbow/privacy-pools-core-sdk";
-import { StarknetDataService } from "./data.service.js";
-import { AuditorData, deriveKeyFromMnemonic,packAuditorData, computeTag, encrypt } from "./auditor.js";
-import { base64 } from "@scure/base"
-
-type AccountServiceConfig = Exclude<ConstructorParameters<typeof AccountService>[1], {account:any}>
-
-export class StarknetAccountService extends AccountService {
-    private mnemonic: string;
-    constructor(dataService: StarknetDataService, config: AccountServiceConfig){ 
-        super(dataService as never, config);
-        this.mnemonic = config.mnemonic;
-    }
-
-    createAuditorData(
-        { label, deposit, children }: PoolAccount,
-        withdrawalValue?: bigint
-    ): {
-        auditorData: AuditorData;
-        withdrawalSecrets: ReturnType<StarknetAccountService['createWithdrawalSecrets']>;
-    } {
-        const viewKey = deriveKeyFromMnemonic(this.mnemonic, label);
-        const accountCommitment = children.at(-1) || deposit;
-        const withdrawalIndex = children.length;
-
-        const withdrawalSecrets = this.createWithdrawalSecrets(accountCommitment);
-
-        const packedData = packAuditorData({
-            value: withdrawalValue || accountCommitment.value,
-            label,
-            ...withdrawalSecrets,
-        });
-
-        const cipherArray = encrypt(packedData, viewKey);
-        const ciphertext = base64.encode(cipherArray);
-
-        const tag = computeTag(viewKey, withdrawalIndex);
-        const auditorData: AuditorData = { tag, ciphertext };
-        return { auditorData, withdrawalSecrets };
-    }
-}
-