@hinkal/common 0.2.26 → 0.2.28

package/data-structures/event-service/evm/ClientBlockchainEventEmitter.mjs

@@ -0,0 +1,25 @@
+import { BlockchainEventEmitter as c } from "./BlockchainEventEmitter.mjs";
+import { ClientEventHelper as a } from "../helpers/ClientEventHelper.mjs";
+class E extends c {
+  clientEventHelper;
+  constructor(e, t, n, s, r, i, l) {
+    super(t, n, s, !1, r, i, l), this.clientEventHelper = new a(t, e);
+  }
+  clear() {
+    this.clientEventHelper.clear();
+  }
+  startUpdateListener() {
+    this.clientEventHelper.startUpdateListener(
+      async (e) => {
+        await this.eventsFetchingMutex.runExclusive(async () => {
+          await this.processEvents(e);
+        });
+      },
+      this.latestBlockNumber + 1,
+      (e) => this.advanceLatestBlockNumber(e)
+    );
+  }
+}
+export {
+  E as ClientBlockchainEventEmitter
+};

package/data-structures/event-service/evm/PollingBlockchainEventEmitter.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./BlockchainEventEmitter.cjs"),t=require("../helpers/PollingEventHelper.cjs");class l extends e.BlockchainEventEmitter{pollingEventHelper=new t.PollingEventHelper;clear(){this.pollingEventHelper.clear()}startUpdateListener(){this.pollingEventHelper.startUpdateListener(async()=>{await this.retrieveEvents(this.latestBlockNumber)})}}exports.PollingBlockchainEventEmitter=l;

package/data-structures/event-service/evm/PollingBlockchainEventEmitter.d.ts

@@ -0,0 +1,6 @@
+import { BlockchainEventEmitter } from './BlockchainEventEmitter';
+export declare class PollingBlockchainEventEmitter extends BlockchainEventEmitter {
+    private pollingEventHelper;
+    protected clear(): void;
+    protected startUpdateListener(): void;
+}

package/data-structures/event-service/evm/PollingBlockchainEventEmitter.mjs

@@ -0,0 +1,16 @@
+import { BlockchainEventEmitter as e } from "./BlockchainEventEmitter.mjs";
+import { PollingEventHelper as t } from "../helpers/PollingEventHelper.mjs";
+class n extends e {
+  pollingEventHelper = new t();
+  clear() {
+    this.pollingEventHelper.clear();
+  }
+  startUpdateListener() {
+    this.pollingEventHelper.startUpdateListener(async () => {
+      await this.retrieveEvents(this.latestBlockNumber);
+    });
+  }
+}
+export {
+  n as PollingBlockchainEventEmitter
+};

package/data-structures/event-service/helpers/ClientEventHelper.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../../error-handling/logger.cjs"),v=require("../../BlockchainEvent/BlockchainEvent.cjs"),h=require("../../../API/API.cjs"),I=5e3;class d{chainId;eventCategory;pollIntervalId;constructor(r,l){this.chainId=r,this.eventCategory=l}clear(){this.pollIntervalId!=null&&(clearInterval(this.pollIntervalId),this.pollIntervalId=void 0)}startUpdateListener(r,l,o){let e=l;const a=async()=>{try{const{events:t,latestBlockNumber:n}=await h.API.getSnapshotServerEvents(this.chainId,this.eventCategory,e);if(t.length>0){const i=t.map(s=>v.BlockchainEvent.fromSerialized(s));await r(i)}n>=e&&(e=n+1,o(e))}catch(t){c.Logger.error("Snapshot events poll error",t)}};this.pollIntervalId=setInterval(a,I)}}exports.ClientEventHelper=d;

package/data-structures/event-service/helpers/ClientEventHelper.d.ts

@@ -0,0 +1,10 @@
+import { EventCategory } from '../../../types/events.types';
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
+export declare class ClientEventHelper {
+    chainId: number;
+    eventCategory: EventCategory;
+    private pollIntervalId;
+    constructor(chainId: number, eventCategory: EventCategory);
+    clear(): void;
+    startUpdateListener(processEvents: (events: BlockchainEvent[]) => Promise<void>, fromBlockNumber: number, onProcessed: (latestBlockNumber: number) => void): void;
+}

package/data-structures/event-service/helpers/ClientEventHelper.mjs

@@ -0,0 +1,38 @@
+import { Logger as c } from "../../../error-handling/logger.mjs";
+import { BlockchainEvent as v } from "../../BlockchainEvent/BlockchainEvent.mjs";
+import { API as h } from "../../../API/API.mjs";
+const I = 5e3;
+class g {
+  chainId;
+  eventCategory;
+  pollIntervalId;
+  constructor(r, l) {
+    this.chainId = r, this.eventCategory = l;
+  }
+  clear() {
+    this.pollIntervalId != null && (clearInterval(this.pollIntervalId), this.pollIntervalId = void 0);
+  }
+  startUpdateListener(r, l, o) {
+    let t = l;
+    const a = async () => {
+      try {
+        const { events: e, latestBlockNumber: n } = await h.getSnapshotServerEvents(
+          this.chainId,
+          this.eventCategory,
+          t
+        );
+        if (e.length > 0) {
+          const i = e.map((s) => v.fromSerialized(s));
+          await r(i);
+        }
+        n >= t && (t = n + 1, o(t));
+      } catch (e) {
+        c.error("Snapshot events poll error", e);
+      }
+    };
+    this.pollIntervalId = setInterval(a, I);
+  }
+}
+export {
+  g as ClientEventHelper
+};

package/data-structures/event-service/helpers/PollingEventHelper.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class t{intervalId;clear(){this.intervalId!==void 0&&clearInterval(this.intervalId),this.intervalId=void 0}startUpdateListener(e){this.intervalId=setInterval(async()=>{await e()},3500)}}exports.PollingEventHelper=t;

package/data-structures/event-service/helpers/PollingEventHelper.d.ts

@@ -0,0 +1,5 @@
+export declare class PollingEventHelper {
+    private intervalId;
+    clear(): void;
+    startUpdateListener(retrieveEvents: () => Promise<void> | void): void;
+}

package/data-structures/event-service/helpers/PollingEventHelper.mjs

@@ -0,0 +1,14 @@
+class a {
+  intervalId;
+  clear() {
+    this.intervalId !== void 0 && clearInterval(this.intervalId), this.intervalId = void 0;
+  }
+  startUpdateListener(t) {
+    this.intervalId = setInterval(async () => {
+      await t();
+    }, 3500);
+  }
+}
+export {
+  a as PollingEventHelper
+};

package/data-structures/event-service/index.d.ts

@@ -5,7 +5,11 @@ export * from './evm/AbstractNullifierSnapshotService';
 export * from './evm/AbstractSnapshotService';
 export * from './evm/AbstractEventService';
 export * from './evm/BlockchainEventEmitter';
+export * from './evm/PollingBlockchainEventEmitter';
+export * from './evm/ClientBlockchainEventEmitter';
 export * from './solana/SolanaBlockchainEventEmitter';
+export * from './solana/ClientSolanaBlockchainEventEmitter';
+export * from './solana/PollingSolanaBlockchainEventEmitter';
 export * from './solana/AbstractSolanaEventService';
 export * from './solana/AbstractSolanaSnapshotService';
 export * from './solana/AbstractSolanaNullifierSnapshotService';

package/data-structures/event-service/solana/AbstractSolanaAccessTokenSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../../constants/protocol.constants.cjs"),c=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const n=require("../../../functions/utils/amounts.utils.cjs"),o=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const l=require("./AbstractSolanaSnapshotService.cjs"),i=require("../../../functions/utils/merkleTree.utils.cjs"),u=require("@solana/web3.js");class A extends l.AbstractSolanaSnapshotService{constructor(e){super(e,"NewAccessKeyAdded")}_merkleTree;_senderAddresses;_senderAddressIndexMap;get merkleTree(){return this._merkleTree}get senderAddresses(){return this._senderAddresses}get senderAddressIndexMap(){return this._senderAddressIndexMap}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),senderAddresses:Array.from(e.payload.senderAddresses),latestBlockNumber:e.latestBlockNumber,senderAddressIndexMap:Array.from(e.payload.senderAddressIndexMap).map(([s,r])=>({address:s,index:r}))}}deserializeSnapshot(e){let s,r;return e.latestBlockNumber&&e.merkleTree?s=i.contructMerkleTreeFromSerialized(e.merkleTree):s=o.MerkleTree.create(c.poseidonFunction,0n),e.latestBlockNumber&&e.senderAddressIndexMap?r=new Map(e.senderAddressIndexMap.map(({address:d,index:t})=>[d,t])):r=new Map,{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:s,senderAddresses:e.senderAddresses??[],senderAddressIndexMap:r}}}acceptEvent(e,s){try{return this._merkleTree.insert(e.access_key,e.index),this._senderAddressIndexMap.set(e.sender_address,Math.max(Number(e.index),this._senderAddressIndexMap.get(e.sender_address)??0)),this._senderAddresses.includes(e.sender_address)||this._senderAddresses.push(e.sender_address),e.access_key===0n&&e.sender_address===a.zeroAddress&&this._merkleTree.remove(e.index),!0}catch(r){return console.error(r),!1}}mapEvent(e){const{access_key:s,index:r,sender_address:d}=e;return{access_key:n.advancedToBigInt(s),index:n.advancedToBigInt(r),sender_address:new u.PublicKey(d).toBase58()}}getSnapshotPayload(){return{merkleTree:this._merkleTree,senderAddresses:this._senderAddresses,senderAddressIndexMap:this._senderAddressIndexMap}}populateSnapshot({payload:{merkleTree:e,senderAddresses:s,senderAddressIndexMap:r}}){this._merkleTree=e,this._senderAddresses=s,this._senderAddressIndexMap=r}}exports.AbstractSolanaAccessTokenSnapshotService=A;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../../constants/protocol.constants.cjs"),c=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const n=require("../../../functions/utils/amounts.utils.cjs"),o=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const l=require("./AbstractSolanaSnapshotService.cjs"),i=require("../../../functions/utils/merkleTree.utils.cjs"),u=require("@solana/web3.js");class A extends l.AbstractSolanaSnapshotService{constructor(e){super(e,"NewAccessKeyAdded")}_merkleTree;_senderAddresses;_senderAddressIndexMap;get merkleTree(){return this._merkleTree}get senderAddresses(){return this._senderAddresses}get senderAddressIndexMap(){return this._senderAddressIndexMap}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),senderAddresses:Array.from(e.payload.senderAddresses),latestBlockNumber:e.latestBlockNumber,senderAddressIndexMap:Array.from(e.payload.senderAddressIndexMap).map(([s,r])=>({address:s,index:r}))}}deserializeSnapshot(e){let s,r;return e.latestBlockNumber&&e.merkleTree?s=i.contructMerkleTreeFromSerialized(e.merkleTree):s=o.MerkleTree.create(c.poseidonFunction,0n),e.latestBlockNumber&&e.senderAddressIndexMap?r=new Map(e.senderAddressIndexMap.map(({address:d,index:t})=>[d,t])):r=new Map,{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:s,senderAddresses:e.senderAddresses??[],senderAddressIndexMap:r}}}acceptEvent(e,s){try{return this._merkleTree.insert(e.access_key,e.index),this._senderAddressIndexMap.set(e.sender_address,Math.max(Number(e.index),this._senderAddressIndexMap.get(e.sender_address)??0)),this._senderAddresses.includes(e.sender_address)||this._senderAddresses.push(e.sender_address),e.access_key===0n&&e.sender_address===a.zeroAddress&&this._merkleTree.remove(e.index),!0}catch(r){return console.error(r),!1}}mapEvent(e){const s=e.getArg("access_key"),r=e.getArg("index"),d=e.getArg("sender_address");return{access_key:n.advancedToBigInt(s),index:n.advancedToBigInt(r),sender_address:new u.PublicKey(d).toBase58()}}getSnapshotPayload(){return{merkleTree:this._merkleTree,senderAddresses:this._senderAddresses,senderAddressIndexMap:this._senderAddressIndexMap}}populateSnapshot({payload:{merkleTree:e,senderAddresses:s,senderAddressIndexMap:r}}){this._merkleTree=e,this._senderAddresses=s,this._senderAddressIndexMap=r}}exports.AbstractSolanaAccessTokenSnapshotService=A;

package/data-structures/event-service/solana/AbstractSolanaAccessTokenSnapshotService.d.ts

@@ -2,6 +2,7 @@ import { MerkleTree, MerkleTreeJson } from '../../merkle-tree';
 import { SolanaAccessTokenEvent } from '../../../types';
 import { AbstractSolanaSnapshotService, SolanaSnapshot } from './AbstractSolanaSnapshotService';
 import { SolanaBlockchainEventEmitter } from './SolanaBlockchainEventEmitter';
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type SolanaSenderAddressIndexMapJson = {
     address: string;
     index: number;
@@ -17,7 +18,7 @@ export type SolanaAccessTokenSerializedSnapshot = {
     senderAddresses?: string[];
     senderAddressIndexMap?: SolanaSenderAddressIndexMapJson;
 };
-export declare abstract class AbstractSolanaAccessTokenSnapshotService extends AbstractSolanaSnapshotService<SolanaAccessTokenEvent<bigint, string>, SolanaAccessTokenEvent<number[], number[]>, SolanaAccessTokenSnapshotPayload, SolanaAccessTokenSerializedSnapshot> {
+export declare abstract class AbstractSolanaAccessTokenSnapshotService extends AbstractSolanaSnapshotService<SolanaAccessTokenEvent<bigint, string>, SolanaAccessTokenSnapshotPayload, SolanaAccessTokenSerializedSnapshot> {
     constructor(accessTokenEventFetcher: SolanaBlockchainEventEmitter);
     private _merkleTree;
     private _senderAddresses;
@@ -28,7 +29,7 @@ export declare abstract class AbstractSolanaAccessTokenSnapshotService extends A
     protected serializeSnapshot(snapshot: SolanaSnapshot<SolanaAccessTokenSnapshotPayload>): SolanaAccessTokenSerializedSnapshot;
     protected deserializeSnapshot(serializedSnapshot: SolanaAccessTokenSerializedSnapshot): SolanaSnapshot<SolanaAccessTokenSnapshotPayload>;
     protected acceptEvent(event: SolanaAccessTokenEvent<bigint, string>, _slot: number): boolean;
-    protected mapEvent(event: SolanaAccessTokenEvent<number[], number[]>): SolanaAccessTokenEvent<bigint, string>;
+    protected mapEvent(event: BlockchainEvent): SolanaAccessTokenEvent<bigint, string>;
     protected getSnapshotPayload(): SolanaAccessTokenSnapshotPayload;
     protected populateSnapshot({ payload: { merkleTree, senderAddresses, senderAddressIndexMap }, }: SolanaSnapshot<SolanaAccessTokenSnapshotPayload>): void;
 }

package/data-structures/event-service/solana/AbstractSolanaAccessTokenSnapshotService.mjs

@@ -8,10 +8,10 @@ import { advancedToBigInt as t } from "../../../functions/utils/amounts.utils.mj
 import { MerkleTree as m } from "../../merkle-tree/MerkleTree.mjs";
 import "ethers";
 import "../../../error-handling/error-codes.constants.mjs";
-import { AbstractSolanaSnapshotService as l } from "./AbstractSolanaSnapshotService.mjs";
-import { contructMerkleTreeFromSerialized as c } from "../../../functions/utils/merkleTree.utils.mjs";
+import { AbstractSolanaSnapshotService as c } from "./AbstractSolanaSnapshotService.mjs";
+import { contructMerkleTreeFromSerialized as l } from "../../../functions/utils/merkleTree.utils.mjs";
 import { PublicKey as p } from "@solana/web3.js";
-class B extends l {
+class N extends c {
   constructor(e) {
     super(e, "NewAccessKeyAdded");
   }
@@ -40,7 +40,7 @@ class B extends l {
   }
   deserializeSnapshot(e) {
     let s, r;
-    return e.latestBlockNumber && e.merkleTree ? s = c(e.merkleTree) : s = m.create(o, 0n), e.latestBlockNumber && e.senderAddressIndexMap ? r = new Map(
+    return e.latestBlockNumber && e.merkleTree ? s = l(e.merkleTree) : s = m.create(o, 0n), e.latestBlockNumber && e.senderAddressIndexMap ? r = new Map(
       e.senderAddressIndexMap.map(({ address: d, index: n }) => [d, n])
     ) : r = /* @__PURE__ */ new Map(), {
       latestBlockNumber: e.latestBlockNumber ?? 0,
@@ -62,7 +62,7 @@ class B extends l {
     }
   }
   mapEvent(e) {
-    const { access_key: s, index: r, sender_address: d } = e;
+    const s = e.getArg("access_key"), r = e.getArg("index"), d = e.getArg("sender_address");
     return {
       access_key: t(s),
       index: t(r),
@@ -83,5 +83,5 @@ class B extends l {
   }
 }
 export {
-  B as AbstractSolanaAccessTokenSnapshotService
+  N as AbstractSolanaAccessTokenSnapshotService
 };

package/data-structures/event-service/solana/AbstractSolanaCommitmentsSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const m=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const c=require("../../../functions/utils/amounts.utils.cjs"),d=require("./AbstractSolanaSnapshotService.cjs"),y=require("../../../functions/utils/merkleTree.utils.cjs"),o=require("../../crypto-keys/decodeUTXO.cjs");class O extends d.AbstractSolanaSnapshotService{constructor(e){super(e,"NewCommitment")}_merkleTree;_encryptedOutputs;get merkleTree(){return this._merkleTree}get encryptedOutputs(){return this._encryptedOutputs}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),latestBlockNumber:e.latestBlockNumber,encryptedOutputs:e.payload.encryptedOutputs.map(t=>({value:t.value,isPositive:String(t.isPositive),isBlocked:t.isBlocked??!1}))}}deserializeSnapshot(e){let t;e.latestBlockNumber&&e.merkleTree?t=y.contructMerkleTreeFromSerialized(e.merkleTree):t=m.MerkleTree.create(p.poseidonFunction,0n);const n=e.encryptedOutputs?.map(r=>({value:r.value,isPositive:JSON.parse(r.isPositive),isBlocked:r.isBlocked??!1}));return{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:t,encryptedOutputs:n||[]}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t}}){this._merkleTree=e,this._encryptedOutputs=t}async mapEvent(e){const{commitment:t,index:n,encrypted_output:r,on_chain_data:s}=e,i=c.advancedToBigInt(t),u=c.advancedToBigInt(n);if(r.length===0){const l=o.encodeSolanaOnChainUtxo(s);return{commitment:i,index:u,encryptedOutput:l}}const a=`0x${Buffer.from(r).toString("hex")}`;return{commitment:i,index:u,encryptedOutput:a}}acceptEvent(e,t,n,r){if(!this.encryptedOutputs.map(s=>s.value).includes(e.encryptedOutput)){if(!this._merkleTree.insert(e.commitment,e.index>=0?e.index:-1n*e.index))return!1;const i={value:e.encryptedOutput,isPositive:!o.isSolanaOnChainUtxo(e.encryptedOutput),isBlocked:r??!1};return this._encryptedOutputs.push(i),!0}return!1}}exports.AbstractSolanaCommitmentsSnapshotService=O;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const l=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const p=require("../../../functions/utils/amounts.utils.cjs"),y=require("./AbstractSolanaSnapshotService.cjs"),O=require("../../../functions/utils/merkleTree.utils.cjs"),d=require("../../crypto-keys/decodeUTXO.cjs");class h extends y.AbstractSolanaSnapshotService{constructor(e){super(e,"NewCommitment")}_merkleTree;_encryptedOutputs;_encryptedOutputsByCommitment=new Map;get merkleTree(){return this._merkleTree}get encryptedOutputs(){return this._encryptedOutputs}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),latestBlockNumber:e.latestBlockNumber,encryptedOutputs:e.payload.encryptedOutputs.map(t=>({value:t.value,isPositive:String(t.isPositive),isBlocked:t.isBlocked??!1})),encryptedOutputsByCommitment:Array.from(e.payload.encryptedOutputsByCommitment.entries()).map(([t,i])=>({commitment:t.toString(),encryptedOutput:i}))}}deserializeSnapshot(e){let t;e.latestBlockNumber&&e.merkleTree?t=O.contructMerkleTreeFromSerialized(e.merkleTree):t=l.MerkleTree.create(a.poseidonFunction,0n);const i=e.encryptedOutputs?.map(r=>({value:r.value,isPositive:JSON.parse(r.isPositive),isBlocked:r.isBlocked??!1})),u=new Map;return e.encryptedOutputsByCommitment?.forEach(({commitment:r,encryptedOutput:n})=>{u.set(BigInt(r),n)}),{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:t,encryptedOutputs:i||[],encryptedOutputsByCommitment:u}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs,encryptedOutputsByCommitment:this._encryptedOutputsByCommitment}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t,encryptedOutputsByCommitment:i}}){this._merkleTree=e,this._encryptedOutputs=t,this._encryptedOutputsByCommitment=i}async mapEvent(e){const t=e.getArg("commitment"),i=e.getArg("index"),u=e.getArg("encrypted_output"),r=e.getArg("on_chain_data"),n=p.advancedToBigInt(t),o=p.advancedToBigInt(i);if(u.length===0){const c=d.encodeSolanaOnChainUtxo(r);return{commitment:n,index:o,encryptedOutput:c}}const s=`0x${Buffer.from(u).toString("hex")}`;return{commitment:n,index:o,encryptedOutput:s}}acceptEvent(e,t,i,u){const r=e.index>=0n?e.index:-1n*e.index,n=this._merkleTree.getValue(r);if(n===e.commitment)return!1;this._merkleTree.insert(e.commitment,r);const o=n!==void 0?this._encryptedOutputsByCommitment.get(n):void 0;if(n!==void 0&&o!==void 0){const s=this.encryptedOutputs.findIndex(c=>c.value===o);s!==-1&&this.encryptedOutputs.splice(s,1),this._encryptedOutputsByCommitment.delete(n)}if(this._encryptedOutputsByCommitment.set(e.commitment,e.encryptedOutput),this.encryptedOutputs.map(s=>s.value).includes(e.encryptedOutput))return!0;const m={value:e.encryptedOutput,isPositive:!d.isSolanaOnChainUtxo(e.encryptedOutput),isBlocked:u??!1};return this._encryptedOutputs.push(m),!0}}exports.AbstractSolanaCommitmentsSnapshotService=h;

package/data-structures/event-service/solana/AbstractSolanaCommitmentsSnapshotService.d.ts

@@ -1,20 +1,24 @@
 import { MerkleTree, MerkleTreeJson } from '../../merkle-tree';
-import { CommitmentEvent, EncryptedOutputWithSign, SolanaCommitmentEvent } from '../../../types';
+import { CommitmentEvent, EncryptedOutputWithCommitment, EncryptedOutputWithSign } from '../../../types';
 import { AbstractSolanaSnapshotService, SolanaSnapshot } from './AbstractSolanaSnapshotService';
 import { SolanaBlockchainEventEmitter } from './SolanaBlockchainEventEmitter';
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type SolanaCommitmentsSnapshotPayload = {
     readonly merkleTree: MerkleTree<bigint>;
     readonly encryptedOutputs: EncryptedOutputWithSign[];
+    readonly encryptedOutputsByCommitment: Map<bigint, string>;
 };
 export type SolanaCommitmentsSerializedSnapshot = {
     latestBlockNumber?: number;
     merkleTree?: MerkleTreeJson;
     encryptedOutputs?: EncryptedOutputWithSign<string>[];
+    encryptedOutputsByCommitment?: EncryptedOutputWithCommitment[];
 };
-export declare abstract class AbstractSolanaCommitmentsSnapshotService extends AbstractSolanaSnapshotService<CommitmentEvent<bigint>, SolanaCommitmentEvent, SolanaCommitmentsSnapshotPayload, SolanaCommitmentsSerializedSnapshot> {
+export declare abstract class AbstractSolanaCommitmentsSnapshotService extends AbstractSolanaSnapshotService<CommitmentEvent<bigint>, SolanaCommitmentsSnapshotPayload, SolanaCommitmentsSerializedSnapshot> {
     constructor(solanaEventEmitter: SolanaBlockchainEventEmitter);
     private _merkleTree;
     private _encryptedOutputs;
+    private _encryptedOutputsByCommitment;
     get merkleTree(): MerkleTree<bigint>;
     get encryptedOutputs(): EncryptedOutputWithSign<boolean>[];
     protected serializeSnapshot(snapshot: SolanaSnapshot<SolanaCommitmentsSnapshotPayload>): SolanaCommitmentsSerializedSnapshot;
@@ -22,8 +26,9 @@ export declare abstract class AbstractSolanaCommitmentsSnapshotService extends A
     protected getSnapshotPayload(): {
         merkleTree: MerkleTree<bigint>;
         encryptedOutputs: EncryptedOutputWithSign<boolean>[];
+        encryptedOutputsByCommitment: Map<bigint, string>;
     };
-    protected populateSnapshot({ payload: { merkleTree, encryptedOutputs }, }: SolanaSnapshot<SolanaCommitmentsSnapshotPayload>): void;
-    protected mapEvent(event: SolanaCommitmentEvent): Promise<CommitmentEvent<bigint>>;
+    protected populateSnapshot({ payload: { merkleTree, encryptedOutputs, encryptedOutputsByCommitment }, }: SolanaSnapshot<SolanaCommitmentsSnapshotPayload>): void;
+    protected mapEvent(event: BlockchainEvent): Promise<CommitmentEvent<bigint>>;
     protected acceptEvent(event: CommitmentEvent<bigint>, _slot: number, _signature?: string, isBlocked?: boolean): boolean;
 }

package/data-structures/event-service/solana/AbstractSolanaCommitmentsSnapshotService.mjs

@@ -1,4 +1,4 @@
-import { poseidonFunction as p } from "../../../crypto/poseidon.mjs";
+import { poseidonFunction as d } from "../../../crypto/poseidon.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
@@ -6,89 +6,106 @@ import "buffer";
 import { MerkleTree as a } from "../../merkle-tree/MerkleTree.mjs";
 import "ethers";
 import "../../../error-handling/error-codes.constants.mjs";
-import { advancedToBigInt as u } from "../../../functions/utils/amounts.utils.mjs";
+import { advancedToBigInt as c } from "../../../functions/utils/amounts.utils.mjs";
 import { AbstractSolanaSnapshotService as l } from "./AbstractSolanaSnapshotService.mjs";
-import { contructMerkleTreeFromSerialized as d } from "../../../functions/utils/merkleTree.utils.mjs";
-import { encodeSolanaOnChainUtxo as y, isSolanaOnChainUtxo as O } from "../../crypto-keys/decodeUTXO.mjs";
+import { contructMerkleTreeFromSerialized as y } from "../../../functions/utils/merkleTree.utils.mjs";
+import { encodeSolanaOnChainUtxo as O, isSolanaOnChainUtxo as h } from "../../crypto-keys/decodeUTXO.mjs";
 class I extends l {
-  constructor(e) {
-    super(e, "NewCommitment");
+  constructor(t) {
+    super(t, "NewCommitment");
   }
   _merkleTree;
   _encryptedOutputs;
+  _encryptedOutputsByCommitment = /* @__PURE__ */ new Map();
   get merkleTree() {
     return this._merkleTree;
   }
   get encryptedOutputs() {
     return this._encryptedOutputs;
   }
-  serializeSnapshot(e) {
+  serializeSnapshot(t) {
     return {
-      merkleTree: e.payload.merkleTree.toJSON(),
-      latestBlockNumber: e.latestBlockNumber,
-      encryptedOutputs: e.payload.encryptedOutputs.map((t) => ({
-        value: t.value,
-        isPositive: String(t.isPositive),
-        isBlocked: t.isBlocked ?? !1
-      }))
+      merkleTree: t.payload.merkleTree.toJSON(),
+      latestBlockNumber: t.latestBlockNumber,
+      encryptedOutputs: t.payload.encryptedOutputs.map((e) => ({
+        value: e.value,
+        isPositive: String(e.isPositive),
+        isBlocked: e.isBlocked ?? !1
+      })),
+      encryptedOutputsByCommitment: Array.from(t.payload.encryptedOutputsByCommitment.entries()).map(
+        ([e, i]) => ({
+          commitment: e.toString(),
+          encryptedOutput: i
+        })
+      )
     };
   }
-  deserializeSnapshot(e) {
-    let t;
-    e.latestBlockNumber && e.merkleTree ? t = d(e.merkleTree) : t = a.create(p, 0n);
-    const n = e.encryptedOutputs?.map((r) => ({
+  deserializeSnapshot(t) {
+    let e;
+    t.latestBlockNumber && t.merkleTree ? e = y(t.merkleTree) : e = a.create(d, 0n);
+    const i = t.encryptedOutputs?.map((r) => ({
       value: r.value,
       isPositive: JSON.parse(r.isPositive),
       isBlocked: r.isBlocked ?? !1
-    }));
-    return {
-      latestBlockNumber: e.latestBlockNumber ?? 0,
+    })), m = /* @__PURE__ */ new Map();
+    return t.encryptedOutputsByCommitment?.forEach(({ commitment: r, encryptedOutput: n }) => {
+      m.set(BigInt(r), n);
+    }), {
+      latestBlockNumber: t.latestBlockNumber ?? 0,
       payload: {
-        merkleTree: t,
-        encryptedOutputs: n || []
+        merkleTree: e,
+        encryptedOutputs: i || [],
+        encryptedOutputsByCommitment: m
       }
     };
   }
   getSnapshotPayload() {
     return {
       merkleTree: this._merkleTree,
-      encryptedOutputs: this._encryptedOutputs
+      encryptedOutputs: this._encryptedOutputs,
+      encryptedOutputsByCommitment: this._encryptedOutputsByCommitment
     };
   }
   populateSnapshot({
-    payload: { merkleTree: e, encryptedOutputs: t }
+    payload: { merkleTree: t, encryptedOutputs: e, encryptedOutputsByCommitment: i }
   }) {
-    this._merkleTree = e, this._encryptedOutputs = t;
+    this._merkleTree = t, this._encryptedOutputs = e, this._encryptedOutputsByCommitment = i;
   }
-  async mapEvent(e) {
-    const { commitment: t, index: n, encrypted_output: r, on_chain_data: i } = e, s = u(t), o = u(n);
-    if (r.length === 0) {
-      const m = y(i);
+  async mapEvent(t) {
+    const e = t.getArg("commitment"), i = t.getArg("index"), m = t.getArg("encrypted_output"), r = t.getArg("on_chain_data"), n = c(e), p = c(i);
+    if (m.length === 0) {
+      const u = O(r);
       return {
-        commitment: s,
-        index: o,
-        encryptedOutput: m
+        commitment: n,
+        index: p,
+        encryptedOutput: u
       };
     }
-    const c = `0x${Buffer.from(r).toString("hex")}`;
+    const o = `0x${Buffer.from(m).toString("hex")}`;
     return {
-      commitment: s,
-      index: o,
-      encryptedOutput: c
+      commitment: n,
+      index: p,
+      encryptedOutput: o
     };
   }
-  acceptEvent(e, t, n, r) {
-    if (!this.encryptedOutputs.map((i) => i.value).includes(e.encryptedOutput)) {
-      if (!this._merkleTree.insert(e.commitment, e.index >= 0 ? e.index : -1n * e.index))
-        return !1;
-      const s = {
-        value: e.encryptedOutput,
-        isPositive: !O(e.encryptedOutput),
-        isBlocked: r ?? !1
-      };
-      return this._encryptedOutputs.push(s), !0;
+  acceptEvent(t, e, i, m) {
+    const r = t.index >= 0n ? t.index : -1n * t.index, n = this._merkleTree.getValue(r);
+    if (n === t.commitment)
+      return !1;
+    this._merkleTree.insert(t.commitment, r);
+    const p = n !== void 0 ? this._encryptedOutputsByCommitment.get(n) : void 0;
+    if (n !== void 0 && p !== void 0) {
+      const o = this.encryptedOutputs.findIndex((u) => u.value === p);
+      o !== -1 && this.encryptedOutputs.splice(o, 1), this._encryptedOutputsByCommitment.delete(n);
     }
-    return !1;
+    if (this._encryptedOutputsByCommitment.set(t.commitment, t.encryptedOutput), this.encryptedOutputs.map((o) => o.value).includes(t.encryptedOutput))
+      return !0;
+    const s = {
+      value: t.encryptedOutput,
+      isPositive: !h(t.encryptedOutput),
+      isBlocked: m ?? !1
+    };
+    return this._encryptedOutputs.push(s), !0;
   }
 }
 export {

package/data-structures/event-service/solana/AbstractSolanaEventService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class i{solanaBlockchainEventEmitter;eventName;constructor(e,s){this.solanaBlockchainEventEmitter=e,this.eventName=s,e.addEventProcessorFunction(this.processEventsPage.bind(this))}get latestBlockNumber(){return this.solanaBlockchainEventEmitter.latestBlockNumber}intervalClear(){this.solanaBlockchainEventEmitter.intervalClear()}async processEventsPage(e){const s=[],n=new Set;e.forEach(({eventName:t,signature:a})=>{t==="BlockedUtxosCreated"&&n.add(a)});const c=e.filter(t=>t.eventName===this.eventName).map(async t=>{try{const a=await this.mapEvent(t.data),o=n.has(t.signature);return await this.acceptEvent(a,t.slot,t.signature,o)?a:null}catch{return null}}),r=(await Promise.all(c)).filter(t=>t!==null);s.push(...r);const l=s.length;return await this.afterEventsAccepted(l),s.length}}exports.AbstractSolanaEventService=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});class l{solanaBlockchainEventEmitter;eventName;constructor(e,s){this.solanaBlockchainEventEmitter=e,this.eventName=s,e.addEventProcessorFunction(this.processEventsPage.bind(this))}get latestBlockNumber(){return this.solanaBlockchainEventEmitter.latestBlockNumber}get isReady(){return this.solanaBlockchainEventEmitter.isReady}get chainId(){return this.solanaBlockchainEventEmitter.chainId}intervalClear(){this.solanaBlockchainEventEmitter.intervalClear()}async processEventsPage(e){const s=[],n=new Set;e.forEach(({eventName:t,transactionHash:a})=>{t==="BlockedUtxosCreated"&&n.add(a)});const c=e.filter(t=>t.eventName===this.eventName).map(async t=>{try{const a=await this.mapEvent(t),o=n.has(t.transactionHash);return await this.acceptEvent(a,t.blockNumber,t.transactionHash,o)?a:null}catch{return null}}),r=(await Promise.all(c)).filter(t=>t!==null);s.push(...r);const i=s.length;return await this.afterEventsAccepted(i),s.length}}exports.AbstractSolanaEventService=l;

package/data-structures/event-service/solana/AbstractSolanaEventService.d.ts

@@ -1,22 +1,17 @@
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 import { SolanaBlockchainEventEmitter } from './SolanaBlockchainEventEmitter';
-export interface SolanaEvent {
-    signature: string;
-    slot: number;
-    blockTime: number;
-    programId: any;
-    data: any;
-    eventName: string;
-}
 type PromiseOrValue<T> = T | Promise<T>;
-export declare abstract class AbstractSolanaEventService<EventType, SerializedEventType = unknown> {
+export declare abstract class AbstractSolanaEventService<EventType> {
     protected solanaBlockchainEventEmitter: SolanaBlockchainEventEmitter;
     protected readonly eventName: string;
     protected constructor(solanaBlockchainEventEmitter: SolanaBlockchainEventEmitter, eventName: string);
     get latestBlockNumber(): number;
+    get isReady(): boolean;
+    get chainId(): number;
     intervalClear(): void;
     private processEventsPage;
     protected abstract acceptEvent(event: EventType, slot: number, signature?: string, isBlocked?: boolean): boolean | Promise<boolean>;
-    protected abstract mapEvent(event: SerializedEventType): PromiseOrValue<EventType>;
+    protected abstract mapEvent(event: BlockchainEvent): PromiseOrValue<EventType>;
     protected abstract afterEventsAccepted(eventsCount: number): Promise<void>;
 }
 export {};

package/data-structures/event-service/solana/AbstractSolanaEventService.mjs

@@ -1,4 +1,4 @@
-class E {
+class u {
   solanaBlockchainEventEmitter;
   eventName;
   constructor(e, s) {
@@ -7,27 +7,33 @@ class E {
   get latestBlockNumber() {
     return this.solanaBlockchainEventEmitter.latestBlockNumber;
   }
+  get isReady() {
+    return this.solanaBlockchainEventEmitter.isReady;
+  }
+  get chainId() {
+    return this.solanaBlockchainEventEmitter.chainId;
+  }
   intervalClear() {
     this.solanaBlockchainEventEmitter.intervalClear();
   }
   async processEventsPage(e) {
     const s = [], a = /* @__PURE__ */ new Set();
-    e.forEach(({ eventName: t, signature: n }) => {
+    e.forEach(({ eventName: t, transactionHash: n }) => {
       t === "BlockedUtxosCreated" && a.add(n);
     });
     const c = e.filter((t) => t.eventName === this.eventName).map(async (t) => {
       try {
-        const n = await this.mapEvent(t.data), o = a.has(t.signature);
-        return await this.acceptEvent(n, t.slot, t.signature, o) ? n : null;
+        const n = await this.mapEvent(t), o = a.has(t.transactionHash);
+        return await this.acceptEvent(n, t.blockNumber, t.transactionHash, o) ? n : null;
       } catch {
         return null;
       }
     }), r = (await Promise.all(c)).filter((t) => t !== null);
     s.push(...r);
-    const l = s.length;
-    return await this.afterEventsAccepted(l), s.length;
+    const i = s.length;
+    return await this.afterEventsAccepted(i), s.length;
   }
 }
 export {
-  E as AbstractSolanaEventService
+  u as AbstractSolanaEventService
 };

package/data-structures/event-service/solana/AbstractSolanaNullifierSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("ethers"),i=require("../../../functions/utils/amounts.utils.cjs"),s=require("./AbstractSolanaSnapshotService.cjs");class n extends s.AbstractSolanaSnapshotService{constructor(e){super(e,"Nullified")}_nullifiers;get nullifiers(){return this._nullifiers}serializeSnapshot(e){return{nullifiers:Array.from(e.payload.nullifiers).map(r=>r.toString()),latestBlockNumber:e.latestBlockNumber}}deserializeSnapshot(e){return{latestBlockNumber:e.latestBlockNumber??0,payload:{nullifiers:new Set(e.nullifiers??[])}}}acceptEvent(e,r){try{return this._nullifiers.has(e.nullifier)?!1:(this._nullifiers.add(e.nullifier),!0)}catch(l){return console.error(l),!1}}mapEvent(e){return{nullifier:t.ethers.toBeHex(i.advancedToBigInt(e.nullifier))}}getSnapshotPayload(){return{nullifiers:this._nullifiers}}populateSnapshot({payload:{nullifiers:e}}){this._nullifiers=e}}exports.AbstractSolanaNullifierSnapshotService=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../../functions/utils/amounts.utils.cjs"),i=require("./AbstractSolanaSnapshotService.cjs"),s=require("ethers");class n extends i.AbstractSolanaSnapshotService{constructor(e){super(e,"Nullified")}_nullifiers;get nullifiers(){return this._nullifiers}serializeSnapshot(e){return{nullifiers:Array.from(e.payload.nullifiers).map(r=>r.toString()),latestBlockNumber:e.latestBlockNumber}}deserializeSnapshot(e){return{latestBlockNumber:e.latestBlockNumber??0,payload:{nullifiers:new Set(e.nullifiers??[])}}}acceptEvent(e,r){try{return this._nullifiers.has(e.nullifier)?!1:(this._nullifiers.add(e.nullifier),!0)}catch(t){return console.error(t),!1}}mapEvent(e){return{nullifier:s.ethers.toBeHex(l.advancedToBigInt(e.getArg("nullifier")))}}getSnapshotPayload(){return{nullifiers:this._nullifiers}}populateSnapshot({payload:{nullifiers:e}}){this._nullifiers=e}}exports.AbstractSolanaNullifierSnapshotService=n;

package/data-structures/event-service/solana/AbstractSolanaNullifierSnapshotService.d.ts

@@ -1,6 +1,7 @@
 import { NullifierEvent } from '../../../types/commitments.types';
 import { AbstractSolanaSnapshotService, SolanaSnapshot } from './AbstractSolanaSnapshotService';
 import { SolanaBlockchainEventEmitter } from './SolanaBlockchainEventEmitter';
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type SolanaNullifierSnapshotPayload = {
     readonly nullifiers: Set<string>;
 };
@@ -8,14 +9,14 @@ export type SolanaNullifierSerializedSnapshot = {
     latestBlockNumber?: number;
     nullifiers?: string[];
 };
-export declare abstract class AbstractSolanaNullifierSnapshotService extends AbstractSolanaSnapshotService<NullifierEvent<string>, NullifierEvent<number[]>, SolanaNullifierSnapshotPayload, SolanaNullifierSerializedSnapshot> {
+export declare abstract class AbstractSolanaNullifierSnapshotService extends AbstractSolanaSnapshotService<NullifierEvent<string>, SolanaNullifierSnapshotPayload, SolanaNullifierSerializedSnapshot> {
     constructor(solanaEventEmitter: SolanaBlockchainEventEmitter);
     private _nullifiers;
     get nullifiers(): Set<string>;
     protected serializeSnapshot(snapshot: SolanaSnapshot<SolanaNullifierSnapshotPayload>): SolanaNullifierSerializedSnapshot;
     protected deserializeSnapshot(serializedSnapshot: SolanaNullifierSerializedSnapshot): SolanaSnapshot<SolanaNullifierSnapshotPayload>;
     protected acceptEvent(event: NullifierEvent<string>, _slot: number): boolean;
-    protected mapEvent(event: NullifierEvent<number[]>): NullifierEvent<string>;
+    protected mapEvent(event: BlockchainEvent): NullifierEvent<string>;
     protected getSnapshotPayload(): SolanaNullifierSnapshotPayload;
     protected populateSnapshot({ payload: { nullifiers } }: SolanaSnapshot<SolanaNullifierSnapshotPayload>): void;
 }

package/data-structures/event-service/solana/AbstractSolanaNullifierSnapshotService.mjs

@@ -1,7 +1,7 @@
-import { ethers as i } from "ethers";
 import { advancedToBigInt as t } from "../../../functions/utils/amounts.utils.mjs";
-import { AbstractSolanaSnapshotService as n } from "./AbstractSolanaSnapshotService.mjs";
-class f extends n {
+import { AbstractSolanaSnapshotService as i } from "./AbstractSolanaSnapshotService.mjs";
+import { ethers as n } from "ethers";
+class f extends i {
   constructor(r) {
     super(r, "Nullified");
   }
@@ -32,7 +32,7 @@ class f extends n {
   }
   mapEvent(r) {
     return {
-      nullifier: i.toBeHex(t(r.nullifier))
+      nullifier: n.toBeHex(t(r.getArg("nullifier")))
     };
   }
   getSnapshotPayload() {

package/data-structures/event-service/solana/AbstractSolanaSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./AbstractSolanaEventService.cjs"),e=require("../../../constants/save-depths.cjs");class o extends a.AbstractSolanaEventService{savedLatestSlot=0;chainId=0;constructor(t,s){super(t,s)}async init(){await this.loadSnapshot(),this.chainId=this.solanaBlockchainEventEmitter.chainId}async retrieveEventsFromLatestBlock(){await this.solanaBlockchainEventEmitter.retrieveEvents(this.latestBlockNumber)}async loadSnapshot(){const t=await this.fetchSnapshot(),s=this.deserializeSnapshot(t);this.populateSnapshot(s),this.solanaBlockchainEventEmitter.syncFromAtMost(s.latestBlockNumber),this.savedLatestSlot=s.latestBlockNumber}saveSnapshot(){return this.savedLatestSlot=this.latestBlockNumber,this.persistSnapshot(this.serializeSnapshot({latestBlockNumber:this.latestBlockNumber,payload:this.getSnapshotPayload()}))}async afterEventsAccepted(t){(t>0||this.savedLatestSlot+e.saveDepths[this.chainId]<this.latestBlockNumber)&&await this.saveSnapshot()}}exports.AbstractSolanaSnapshotService=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./AbstractSolanaEventService.cjs"),a=require("../../../constants/save-depths.cjs");class o extends e.AbstractSolanaEventService{savedLatestSlot=0;constructor(t,s){super(t,s)}async init(){await this.loadSnapshot()}async retrieveEventsFromLatestBlock(){await this.solanaBlockchainEventEmitter.retrieveEvents(this.latestBlockNumber)}async loadSnapshot(){const t=await this.fetchSnapshot(),s=this.deserializeSnapshot(t);this.populateSnapshot(s),this.solanaBlockchainEventEmitter.syncFromAtMost(s.latestBlockNumber),this.savedLatestSlot=s.latestBlockNumber}saveSnapshot(){return this.savedLatestSlot=this.latestBlockNumber,this.persistSnapshot(this.serializeSnapshot({latestBlockNumber:this.latestBlockNumber,payload:this.getSnapshotPayload()}))}async afterEventsAccepted(t){(t>0||this.savedLatestSlot+a.saveDepths[this.chainId]<this.latestBlockNumber)&&await this.saveSnapshot()}}exports.AbstractSolanaSnapshotService=o;

package/data-structures/event-service/solana/AbstractSolanaSnapshotService.d.ts

@@ -4,9 +4,8 @@ export interface SolanaSnapshot<SnapshotPayloadType> {
     readonly latestBlockNumber: number;
     readonly payload: SnapshotPayloadType;
 }
-export declare abstract class AbstractSolanaSnapshotService<EventType, SerializedEventType, SnapshotPayloadType, SerializedSnapshotType> extends AbstractSolanaEventService<EventType, SerializedEventType> {
+export declare abstract class AbstractSolanaSnapshotService<EventType, SnapshotPayloadType, SerializedSnapshotType> extends AbstractSolanaEventService<EventType> {
     private savedLatestSlot;
-    private chainId;
     protected constructor(solanaBlockchainEventEmitter: SolanaBlockchainEventEmitter, eventName: string);
     init(): Promise<void>;
     retrieveEventsFromLatestBlock(): Promise<void>;

package/data-structures/event-service/solana/AbstractSolanaSnapshotService.mjs

@@ -2,12 +2,11 @@ import { AbstractSolanaEventService as a } from "./AbstractSolanaEventService.mj
 import { saveDepths as e } from "../../../constants/save-depths.mjs";
 class n extends a {
   savedLatestSlot = 0;
-  chainId = 0;
   constructor(t, s) {
     super(t, s);
   }
   async init() {
-    await this.loadSnapshot(), this.chainId = this.solanaBlockchainEventEmitter.chainId;
+    await this.loadSnapshot();
   }
   async retrieveEventsFromLatestBlock() {
     await this.solanaBlockchainEventEmitter.retrieveEvents(this.latestBlockNumber);

package/data-structures/event-service/solana/ClientSolanaBlockchainEventEmitter.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../../types/events.types.cjs"),c=require("./SolanaBlockchainEventEmitter.cjs"),o=require("../helpers/ClientEventHelper.cjs");class v extends c.SolanaBlockchainEventEmitter{clientEventHelper;constructor(e,n,i,s,r,a,t){super(e,n,i,s,!1,r,a),t&&this.setIdl(t),this.clientEventHelper=new o.ClientEventHelper(e,l.EventCategory.MainContractEvents)}clear(){this.clientEventHelper.clear()}startUpdateListener(){this.clientEventHelper.startUpdateListener(async e=>{await this.eventsFetchingMutex.runExclusive(async()=>{await this.processEvents(e)})},this.latestBlockNumber+1,e=>this.advanceLatestBlockNumber(e))}}exports.ClientSolanaBlockchainEventEmitter=v;