@0xbow/privacy-pools-core-sdk 0.0.0-c42a71a3 → 0.0.0-e101aa

package/dist/node/index.mjs

@@ -1,4 +1,4 @@
-export { n as AccountError, A as AccountService, B as BlockchainProvider, o as CircuitName, j as Circuits, C as CommitmentService, m as ContractError, k as ContractInteractionsService, D as DataService, E as ErrorCode, I as InvalidRpcUrl, P as PrivacyPoolSDK, l as ProofError, S as SDKError, W as WithdrawalService, e as bigintToHash, f as bigintToHex, i as calculateContext, a as generateDepositSecrets, g as generateMasterKeys, d as generateMerkleProof, b as generateWithdrawalSecrets, c as getCommitment, h as hashPrecommitment } from './index-BgfrdIiJ.js';
+export { n as AccountError, A as AccountService, B as BlockchainProvider, o as CircuitName, j as Circuits, C as CommitmentService, m as ContractError, k as ContractInteractionsService, D as DataService, E as ErrorCode, I as InvalidRpcUrl, P as PrivacyPoolSDK, l as ProofError, S as SDKError, W as WithdrawalService, e as bigintToHash, f as bigintToHex, i as calculateContext, a as generateDepositSecrets, g as generateMasterKeys, d as generateMerkleProof, b as generateWithdrawalSecrets, c as getCommitment, h as hashPrecommitment } from './index-Q1Q7Va3Q.js';
 import 'viem/accounts';
 import 'buffer';
 import 'http';

package/dist/types/{fetchArtifacts.esm-s8imnxFN.js → fetchArtifacts.esm-BmDEMaUO.js}

@@ -1,4 +1,4 @@
-import { F as FetchArtifact } from './index-BZkN1dA8.js';
+import { F as FetchArtifact } from './index-BITDYIPX.js';
 import 'viem/accounts';
 import 'buffer';
 import 'http';

package/dist/types/{fetchArtifacts.node-BwpGMlwi.js → fetchArtifacts.node-ClHhvnhY.js}

@@ -1,4 +1,4 @@
-import { F as FetchArtifact } from './index-BZkN1dA8.js';
+import { F as FetchArtifact } from './index-BITDYIPX.js';
 import 'viem/accounts';
 import 'buffer';
 import 'http';

package/dist/types/{index-BZkN1dA8.js → index-BITDYIPX.js}

@@ -15082,19 +15082,10 @@ var __setModuleDefault = Object.create ? (function(o, v) {
     o["default"] = v;
 };
 
-var ownKeys = function(o) {
-    ownKeys = Object.getOwnPropertyNames || function (o) {
-        var ar = [];
-        for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-        return ar;
-    };
-    return ownKeys(o);
-};
-
 function __importStar(mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 }
@@ -15176,25 +15167,12 @@ function __disposeResources(env) {
     return next();
 }
 
-function __rewriteRelativeImportExtension(path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-}
-
 var tslib_es6 = {
     __extends: __extends,
     __assign: __assign,
     __rest: __rest,
     __decorate: __decorate,
     __param: __param,
-    __esDecorate: __esDecorate,
-    __runInitializers: __runInitializers,
-    __propKey: __propKey,
-    __setFunctionName: __setFunctionName,
     __metadata: __metadata,
     __awaiter: __awaiter,
     __generator: __generator,
@@ -15217,7 +15195,6 @@ var tslib_es6 = {
     __classPrivateFieldIn: __classPrivateFieldIn,
     __addDisposableResource: __addDisposableResource,
     __disposeResources: __disposeResources,
-    __rewriteRelativeImportExtension: __rewriteRelativeImportExtension,
 };
 
 var tslib_es6$1 = /*#__PURE__*/Object.freeze({
@@ -15247,7 +15224,6 @@ var tslib_es6$1 = /*#__PURE__*/Object.freeze({
     __propKey: __propKey,
     __read: __read,
     __rest: __rest,
-    __rewriteRelativeImportExtension: __rewriteRelativeImportExtension,
     __runInitializers: __runInitializers,
     __setFunctionName: __setFunctionName,
     __spread: __spread,
@@ -50363,9 +50339,9 @@ var hashingExports = requireHashing();
 
 /**
  * @module @zk-kit/utils
- * @version 1.2.1
+ * @version 1.4.1
  * @file Essential zero-knowledge utility library for JavaScript developers.
- * @copyright Ethereum Foundation 2024
+ * @copyright Ethereum Foundation 2025
  * @license MIT
  * @see [Github]{@link https://github.com/privacy-scaling-explorations/zk-kit/tree/main/packages/utils}
 */
@@ -50415,9 +50391,9 @@ function isArray(value) {
 
 /**
  * @module @zk-kit/utils
- * @version 1.2.1
+ * @version 1.4.1
  * @file Essential zero-knowledge utility library for JavaScript developers.
- * @copyright Ethereum Foundation 2024
+ * @copyright Ethereum Foundation 2025
  * @license MIT
  * @see [Github]{@link https://github.com/privacy-scaling-explorations/zk-kit/tree/main/packages/utils}
 */
@@ -50484,9 +50460,9 @@ function requireArray(parameterValue, parameterName) {
 
 /**
  * @module @zk-kit/lean-imt
- * @version 2.2.2
+ * @version 2.2.4
  * @file Lean Incremental Merkle tree implementation in TypeScript.
- * @copyright Ethereum Foundation 2024
+ * @copyright Ethereum Foundation 2025
  * @license MIT
  * @see [Github]{@link https://github.com/privacy-scaling-explorations/zk-kit/tree/main/packages/lean-imt}
 */
@@ -50617,7 +50593,7 @@ class LeanIMT {
             throw new Error("There are no leaves to add");
         }
         let startIndex = this.size >> 1;
-        this._nodes[0].push(...leaves);
+        this._nodes[0] = this._nodes[0].concat(leaves);
         // Calculate how many tree levels will need to be added
         // using the number of leaves.
         const numberOfNewLevels = Math.ceil(Math.log2(this.size)) - this.depth;
@@ -50748,7 +50724,12 @@ class LeanIMT {
         }
         // The index might be different from the original index of the leaf, since
         // in some cases some siblings are not included (as explained above).
-        return { root: this.root, leaf, index: Number.parseInt(path.reverse().join(""), 2), siblings };
+        return {
+            root: this.root,
+            leaf,
+            index: path.length === 0 ? 0 : Number.parseInt(path.reverse().join(""), 2),
+            siblings
+        };
     }
     /**
      * It verifies a {@link LeanIMTMerkleProof} to confirm that a leaf indeed
@@ -51089,10 +51070,10 @@ const circuitToAsset = {
 
 async function importFetchVersionedArtifact(isBrowser) {
     if (isBrowser) {
-        return import('./fetchArtifacts.esm-s8imnxFN.js');
+        return import('./fetchArtifacts.esm-BmDEMaUO.js');
     }
     else {
-        return import('./fetchArtifacts.node-BwpGMlwi.js');
+        return import('./fetchArtifacts.node-ClHhvnhY.js');
     }
 }
 
@@ -76675,6 +76656,12 @@ class AccountService {
     addPoolAccount(scope, value, nullifier, secret, label, blockNumber, txHash) {
         const precommitment = this._hashPrecommitment(nullifier, secret);
         const commitment = this._hashCommitment(value, label, precommitment);
+        this.logger.debug(`Commitment calculation details`, {
+            value,
+            label,
+            precommitment,
+            commitment,
+        });
         const newAccount = {
             label,
             deposit: {
@@ -76794,7 +76781,11 @@ class AccountService {
             });
             const depositMap = new Map();
             for (const event of depositEvents) {
-                depositMap.set(event.precommitment, event);
+                const existingEvent = depositMap.get(event.precommitment);
+                // If no existing event, or current event is older (earlier block), use current event
+                if (!existingEvent || event.blockNumber < existingEvent.blockNumber) {
+                    depositMap.set(event.precommitment, event);
+                }
             }
             return depositMap;
         }
@@ -76896,7 +76887,7 @@ class AccountService {
      *
      */
     _processDepositEvents(scope, depositEvents) {
-        const MAX_CONSECUTIVE_MISSES = 10; // Large enough to avoid and tx failures
+        const MAX_CONSECUTIVE_MISSES = 10; // Large enough to avoid tx failures
         const foundIndices = new Set();
         let consecutiveMisses = 0;
         for (let index = BigInt(0);; index++) {

package/dist/types/index.js

@@ -1,4 +1,4 @@
-export { n as AccountError, A as AccountService, B as BlockchainProvider, o as CircuitName, j as Circuits, C as CommitmentService, m as ContractError, k as ContractInteractionsService, D as DataService, E as ErrorCode, I as InvalidRpcUrl, P as PrivacyPoolSDK, l as ProofError, S as SDKError, W as WithdrawalService, e as bigintToHash, f as bigintToHex, i as calculateContext, a as generateDepositSecrets, g as generateMasterKeys, d as generateMerkleProof, b as generateWithdrawalSecrets, c as getCommitment, h as hashPrecommitment } from './index-BZkN1dA8.js';
+export { n as AccountError, A as AccountService, B as BlockchainProvider, o as CircuitName, j as Circuits, C as CommitmentService, m as ContractError, k as ContractInteractionsService, D as DataService, E as ErrorCode, I as InvalidRpcUrl, P as PrivacyPoolSDK, l as ProofError, S as SDKError, W as WithdrawalService, e as bigintToHash, f as bigintToHex, i as calculateContext, a as generateDepositSecrets, g as generateMasterKeys, d as generateMerkleProof, b as generateWithdrawalSecrets, c as getCommitment, h as hashPrecommitment } from './index-BITDYIPX.js';
 import 'viem/accounts';
 import 'buffer';
 import 'http';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xbow/privacy-pools-core-sdk",
-  "version": "0.0.0-c42a71a3",
+  "version": "0.0.0-e101aa",
   "description": "Typescript SDK for the Privacy Pool protocol",
   "repository": "https://github.com/0xbow-io/privacy-pools-core",
   "license": "Apache-2.0",

package/src/core/account.service.ts

@@ -1,27 +1,15 @@
-import { poseidon } from "maci-crypto/build/ts/hashing.js";
-import { Hash, Secret } from "../types/commitment.js";
-import { Hex, bytesToNumber } from "viem";
-import { mnemonicToAccount } from "viem/accounts";
-import { DataService } from "./data.service.js";
-import {
-  AccountCommitment,
-  PoolAccount,
-  PoolInfo,
-  PrivacyPoolAccount,
-} from "../types/account.js";
-import {
-  DepositEvent,
-  PoolEventsError,
-  PoolEventsResult,
-  RagequitEvent,
-  WithdrawalEvent,
-} from "../types/events.js";
-
-import { Logger } from "../utils/logger.js";
-import { LogLevel } 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";
+import {poseidon} from "maci-crypto/build/ts/hashing.js";
+import {Hash, Secret} from "../types/commitment.js";
+import {bytesToNumber, Hex} from "viem";
+import {mnemonicToAccount} from "viem/accounts";
+import {DataService} from "./data.service.js";
+import {AccountCommitment, PoolAccount, PoolInfo, PrivacyPoolAccount,} from "../types/account.js";
+import {DepositEvent, PoolEventsError, PoolEventsResult, RagequitEvent, WithdrawalEvent,} from "../types/events.js";
+
+import {Logger, LogLevel} 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 =
   | {
@@ -327,6 +315,13 @@ export class AccountService {
     const precommitment = this._hashPrecommitment(nullifier, secret);
     const commitment = this._hashCommitment(value, label, precommitment);
 
+    this.logger.debug(`Commitment calculation details`, {
+        value,
+        label,
+        precommitment,
+        commitment,
+    })
+
     const newAccount: PoolAccount = {
       label,
       deposit: {
@@ -489,7 +484,12 @@ export class AccountService {
 
       const depositMap = new Map<Hash, DepositEvent>();
       for (const event of depositEvents) {
-        depositMap.set(event.precommitment, event);
+        const existingEvent = depositMap.get(event.precommitment);
+
+        // If no existing event, or current event is older (earlier block), use current event
+        if (!existingEvent || event.blockNumber < existingEvent.blockNumber) {
+          depositMap.set(event.precommitment, event);
+        }
       }
 
       return depositMap;
@@ -622,7 +622,7 @@ export class AccountService {
     scope: Hash,
     depositEvents: Map<Hash, DepositEvent>
   ): void {
-    const MAX_CONSECUTIVE_MISSES = 10; // Large enough to avoid and tx failures
+    const MAX_CONSECUTIVE_MISSES = 10; // Large enough to avoid tx failures
 
     const foundIndices = new Set<bigint>();
     let consecutiveMisses = 0;