@hinkal/common 0.2.21 → 0.2.23

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

@@ -2,7 +2,6 @@ import { AbstractSnapshotService, Snapshot } from './AbstractSnapshotService';
 import { NewApprovedUtxoEvent } from '../../../types/commitments.types';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
 import { ApprovedUtxo } from '../../../types/hinkal.types';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type ApprovalsSnapshotPayload = {
     readonly approvals: Map<string, ApprovedUtxo[]>;
     readonly events: Set<string>;
@@ -12,7 +11,7 @@ export type ApprovalsSerializedSnapshot = {
     approvals: Record<string, ApprovedUtxo<string>[]>;
     events: string[];
 };
-export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
+export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, NewApprovedUtxoEvent<string>, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _approvals;
     events: Set<string>;
@@ -25,6 +24,6 @@ export declare abstract class AbstractApprovalsSnapshotService extends AbstractS
         events: Set<string>;
     };
     protected populateSnapshot({ payload: { approvals, events } }: Snapshot<ApprovalsSnapshotPayload>): void;
-    protected mapEvent(event: BlockchainEvent): NewApprovedUtxoEvent;
+    protected mapEvent(event: NewApprovedUtxoEvent<string>): NewApprovedUtxoEvent;
     protected acceptEvent(event: NewApprovedUtxoEvent, _blockNumber: number, txHash: string): boolean;
 }

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

@@ -1,7 +1,7 @@
 import { AbstractSnapshotService as c } from "./AbstractSnapshotService.mjs";
 import { toBigInt as v } from "../../../functions/utils/amounts.utils.mjs";
-import { caseInsensitiveEqual as A } from "../../../functions/utils/caseInsensitive.utils.mjs";
-class f extends c {
+import { caseInsensitiveEqual as u } from "../../../functions/utils/caseInsensitive.utils.mjs";
+class g extends c {
   constructor(e) {
     super(e, "NewApprovedUtxo");
   }
@@ -57,7 +57,7 @@ class f extends c {
     this._approvals = e, this.events = t;
   }
   mapEvent(e) {
-    const t = e.getArg("approveTo"), s = e.getArg("tokenAddress"), r = e.getArg("amount"), p = e.getArg("inHinkalAddress");
+    const { approveTo: t, tokenAddress: s, amount: r, inHinkalAddress: p } = e;
     return {
       approveTo: t,
       tokenAddress: s,
@@ -75,7 +75,7 @@ class f extends c {
       };
       let a = this.approvals.get(e.approveTo) || [], d = !1;
       for (let o = 0; o < a.length; o += 1)
-        A(i, a[o].tokenAddress) && l === a[o].inHinkalAddress && (a[o].amount += p, d = !0);
+        u(i, a[o].tokenAddress) && l === a[o].inHinkalAddress && (a[o].amount += p, d = !0);
       if (a = a.filter((o) => o.amount !== 0n), d && a.length === 0)
         this.approvals.delete(e.approveTo);
       else {
@@ -88,5 +88,5 @@ class f extends c {
   }
 }
 export {
-  f as AbstractApprovalsSnapshotService
+  g as AbstractApprovalsSnapshotService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=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 u=require("../../../functions/utils/amounts.utils.cjs"),o=require("./AbstractSnapshotService.cjs"),p=require("../../../functions/utils/merkleTree.utils.cjs");class m extends o.AbstractSnapshotService{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=p.contructMerkleTreeFromSerialized(e.merkleTree):t=l.MerkleTree.create(n.poseidonFunction,0n);const s=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:s||[]}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t}}){this._merkleTree=e,this._encryptedOutputs=t}mapEvent(e){const t=e.getArg("commitment"),s=e.getArg("index"),r=e.getArg("encryptedOutput");return{commitment:u.toBigInt(t),index:u.toBigInt(s),encryptedOutput:r}}acceptEvent(e,t,s,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 c={value:e.encryptedOutput,isPositive:e.index>=0n,isBlocked:r??!1};return this._encryptedOutputs.push(c),!0}return!1}}exports.AbstractCommitmentsSnapshotService=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=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 u=require("../../../functions/utils/amounts.utils.cjs"),o=require("./AbstractSnapshotService.cjs"),p=require("../../../functions/utils/merkleTree.utils.cjs");class a extends o.AbstractSnapshotService{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=p.contructMerkleTreeFromSerialized(e.merkleTree):t=l.MerkleTree.create(c.poseidonFunction,0n);const s=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:s||[]}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t}}){this._merkleTree=e,this._encryptedOutputs=t}mapEvent(e){const{commitment:t,index:s,encryptedOutput:r}=e;return{commitment:u.toBigInt(t),index:u.toBigInt(s),encryptedOutput:r}}acceptEvent(e,t,s,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 n={value:e.encryptedOutput,isPositive:e.index>=0n,isBlocked:r??!1};return this._encryptedOutputs.push(n),!0}return!1}}exports.AbstractCommitmentsSnapshotService=a;

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

@@ -2,7 +2,6 @@ import { MerkleTree, MerkleTreeJson } from '../../merkle-tree';
 import { CommitmentEvent, EncryptedOutputWithSign } from '../../../types';
 import { AbstractSnapshotService, Snapshot } from './AbstractSnapshotService';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type CommitmentsSnapshotPayload = {
     readonly merkleTree: MerkleTree<bigint>;
     readonly encryptedOutputs: EncryptedOutputWithSign[];
@@ -12,7 +11,7 @@ export type CommitmentsSerializedSnapshot = {
     merkleTree?: MerkleTreeJson;
     encryptedOutputs?: EncryptedOutputWithSign<string>[];
 };
-export declare abstract class AbstractCommitmentsSnapshotService extends AbstractSnapshotService<CommitmentEvent<bigint>, CommitmentsSnapshotPayload, CommitmentsSerializedSnapshot> {
+export declare abstract class AbstractCommitmentsSnapshotService extends AbstractSnapshotService<CommitmentEvent<bigint>, CommitmentEvent, CommitmentsSnapshotPayload, CommitmentsSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _merkleTree;
     private _encryptedOutputs;
@@ -25,6 +24,6 @@ export declare abstract class AbstractCommitmentsSnapshotService extends Abstrac
         encryptedOutputs: EncryptedOutputWithSign<boolean>[];
     };
     protected populateSnapshot({ payload: { merkleTree, encryptedOutputs }, }: Snapshot<CommitmentsSnapshotPayload>): void;
-    protected mapEvent(event: BlockchainEvent): CommitmentEvent<bigint>;
+    protected mapEvent(event: CommitmentEvent): CommitmentEvent<bigint>;
     protected acceptEvent(event: CommitmentEvent<bigint>, _blockNumber: number, _txHash?: string, isBlocked?: boolean): boolean;
 }

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

@@ -1,15 +1,15 @@
-import { poseidonFunction as c } from "../../../crypto/poseidon.mjs";
+import { poseidonFunction as m } from "../../../crypto/poseidon.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-import { MerkleTree as m } from "../../merkle-tree/MerkleTree.mjs";
+import { MerkleTree as c } from "../../merkle-tree/MerkleTree.mjs";
 import "ethers";
 import "../../../error-handling/error-codes.constants.mjs";
 import { toBigInt as p } from "../../../functions/utils/amounts.utils.mjs";
 import { AbstractSnapshotService as o } from "./AbstractSnapshotService.mjs";
 import { contructMerkleTreeFromSerialized as n } from "../../../functions/utils/merkleTree.utils.mjs";
-class x extends o {
+class b extends o {
   constructor(e) {
     super(e, "NewCommitment");
   }
@@ -34,7 +34,7 @@ class x extends o {
   }
   deserializeSnapshot(e) {
     let t;
-    e.latestBlockNumber && e.merkleTree ? t = n(e.merkleTree) : t = m.create(c, 0n);
+    e.latestBlockNumber && e.merkleTree ? t = n(e.merkleTree) : t = c.create(m, 0n);
     const s = e.encryptedOutputs?.map((r) => ({
       value: r.value,
       isPositive: JSON.parse(r.isPositive),
@@ -60,7 +60,7 @@ class x extends o {
     this._merkleTree = e, this._encryptedOutputs = t;
   }
   mapEvent(e) {
-    const t = e.getArg("commitment"), s = e.getArg("index"), r = e.getArg("encryptedOutput");
+    const { commitment: t, index: s, encryptedOutput: r } = e;
     return {
       commitment: p(t),
       index: p(s),
@@ -82,5 +82,5 @@ class x extends o {
   }
 }
 export {
-  x as AbstractCommitmentsSnapshotService
+  b as AbstractCommitmentsSnapshotService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../../functions/utils/resolve-sync.utils.cjs");class h{blockchainEventEmitter;eventName;constructor(t,s){this.blockchainEventEmitter=t,this.eventName=s,t.addEventProcessorFunction(this.processEventsPage.bind(this))}get latestBlockNumber(){return this.blockchainEventEmitter.latestBlockNumber}get chainId(){return this.blockchainEventEmitter.chainId}intervalClear(){this.blockchainEventEmitter.intervalClear()}async processEventsPage(t){const s=new Set;t.forEach(({eventName:e,transactionHash:c})=>{e==="BlockedUtxosCreated"&&s.add(c)});const n=[];await l.resolveSync(t.map(e=>async()=>{if(e.eventName!==this.eventName)return;const{blockNumber:c,transactionHash:a}=e,r=this.mapEvent(e),o=s.has(a);await this.acceptEvent(r,c,a,o)&&n.push(r)}));const i=n.length;return await this.afterEventsAccepted(i),n.length}}exports.AbstractEventService=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../../../functions/utils/resolve-sync.utils.cjs");class h{blockchainEventEmitter;eventName;constructor(e,s){this.blockchainEventEmitter=e,this.eventName=s,e.addEventProcessorFunction(this.processEventsPage.bind(this))}get latestBlockNumber(){return this.blockchainEventEmitter.latestBlockNumber}intervalClear(){this.blockchainEventEmitter.intervalClear()}async processEventsPage(e){const s=new Set;e.forEach(t=>{t.eventName==="BlockedUtxosCreated"&&s.add(t.transactionHash)});const n=[];await v.resolveSync(e.map(t=>async()=>{if(t.eventName!==this.eventName)return;const{args:c,blockNumber:i,transactionHash:a}=t;if(!c)throw new Error("Wrong event structure");const r=this.mapEvent(c),l=s.has(a);await this.acceptEvent(r,i,a,l)&&n.push(r)}));const o=n.length;return await this.afterEventsAccepted(o),n.length}}exports.AbstractEventService=h;

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

@@ -1,14 +1,12 @@
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
-export declare abstract class AbstractEventService<EventType> {
+export declare abstract class AbstractEventService<EventType, SerializedEventType = unknown> {
     protected blockchainEventEmitter: BlockchainEventEmitter;
     protected readonly eventName: string;
     protected constructor(blockchainEventEmitter: BlockchainEventEmitter, eventName: string);
     get latestBlockNumber(): number;
-    get chainId(): number;
     intervalClear(): void;
     private processEventsPage;
     protected abstract acceptEvent(event: EventType, blockNumber: number, txHash?: string, isBlocked?: boolean): boolean | Promise<boolean>;
-    protected abstract mapEvent(event: BlockchainEvent): EventType;
+    protected abstract mapEvent(event: SerializedEventType): EventType;
     protected abstract afterEventsAccepted(eventsCount: number): Promise<void>;
 }

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

@@ -1,5 +1,5 @@
-import { resolveSync as h } from "../../../functions/utils/resolve-sync.utils.mjs";
-class m {
+import { resolveSync as v } from "../../../functions/utils/resolve-sync.utils.mjs";
+class u {
   blockchainEventEmitter;
   eventName;
   constructor(t, s) {
@@ -8,30 +8,30 @@ class m {
   get latestBlockNumber() {
     return this.blockchainEventEmitter.latestBlockNumber;
   }
-  get chainId() {
-    return this.blockchainEventEmitter.chainId;
-  }
   intervalClear() {
     this.blockchainEventEmitter.intervalClear();
   }
   async processEventsPage(t) {
     const s = /* @__PURE__ */ new Set();
-    t.forEach(({ eventName: e, transactionHash: c }) => {
-      e === "BlockedUtxosCreated" && s.add(c);
+    t.forEach((e) => {
+      e.eventName === "BlockedUtxosCreated" && s.add(e.transactionHash);
     });
     const n = [];
-    await h(
+    await v(
       t.map((e) => async () => {
         if (e.eventName !== this.eventName)
           return;
-        const { blockNumber: c, transactionHash: a } = e, i = this.mapEvent(e), o = s.has(a);
-        await this.acceptEvent(i, c, a, o) && n.push(i);
+        const { args: a, blockNumber: i, transactionHash: c } = e;
+        if (!a)
+          throw new Error("Wrong event structure");
+        const r = this.mapEvent(a), h = s.has(c);
+        await this.acceptEvent(r, i, c, h) && n.push(r);
       })
     );
-    const r = n.length;
-    return await this.afterEventsAccepted(r), n.length;
+    const o = n.length;
+    return await this.afterEventsAccepted(o), n.length;
   }
 }
 export {
-  m as AbstractEventService
+  u as AbstractEventService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("ethers"),i=require("./AbstractSnapshotService.cjs");class s extends i.AbstractSnapshotService{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){const r=e.getArg("nullifier");return{nullifier:t.BigNumber.from(r).toHexString()}}getSnapshotPayload(){return{nullifiers:this._nullifiers}}populateSnapshot({payload:{nullifiers:e}}){this._nullifiers=e}}exports.AbstractNullifierSnapshotService=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("ethers"),i=require("./AbstractSnapshotService.cjs");class s extends i.AbstractSnapshotService{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){const{nullifier:r}=e;return{nullifier:l.ethers.toBeHex(r)}}getSnapshotPayload(){return{nullifiers:this._nullifiers}}populateSnapshot({payload:{nullifiers:e}}){this._nullifiers=e}}exports.AbstractNullifierSnapshotService=s;

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

@@ -1,7 +1,6 @@
 import { NullifierEvent } from '../../../types/commitments.types';
 import { AbstractSnapshotService, Snapshot } from './AbstractSnapshotService';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type NullifierSnapshotPayload = {
     readonly nullifiers: Set<string>;
 };
@@ -9,14 +8,14 @@ export type NullifierSerializedSnapshot = {
     latestBlockNumber?: number;
     nullifiers?: string[];
 };
-export declare abstract class AbstractNullifierSnapshotService extends AbstractSnapshotService<NullifierEvent<string>, NullifierSnapshotPayload, NullifierSerializedSnapshot> {
+export declare abstract class AbstractNullifierSnapshotService extends AbstractSnapshotService<NullifierEvent<string>, NullifierEvent<bigint>, NullifierSnapshotPayload, NullifierSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _nullifiers;
     get nullifiers(): Set<string>;
     protected serializeSnapshot(snapshot: Snapshot<NullifierSnapshotPayload>): NullifierSerializedSnapshot;
     protected deserializeSnapshot(serializedSnapshot: NullifierSerializedSnapshot): Snapshot<NullifierSnapshotPayload>;
     protected acceptEvent(event: NullifierEvent<string>, _blockNumber: number): boolean;
-    protected mapEvent(event: BlockchainEvent): NullifierEvent<string>;
+    protected mapEvent(event: NullifierEvent<bigint>): NullifierEvent<string>;
     protected getSnapshotPayload(): NullifierSnapshotPayload;
     protected populateSnapshot({ payload: { nullifiers } }: Snapshot<NullifierSnapshotPayload>): void;
 }

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

@@ -1,4 +1,4 @@
-import { BigNumber as i } from "ethers";
+import { ethers as i } from "ethers";
 import { AbstractSnapshotService as t } from "./AbstractSnapshotService.mjs";
 class a extends t {
   constructor(r) {
@@ -30,9 +30,9 @@ class a extends t {
     }
   }
   mapEvent(r) {
-    const e = r.getArg("nullifier");
+    const { nullifier: e } = r;
     return {
-      nullifier: i.from(e).toHexString()
+      nullifier: i.toBeHex(e)
     };
   }
   getSnapshotPayload() {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../../constants/save-depths.cjs"),a=require("./AbstractEventService.cjs");class i extends a.AbstractEventService{savedLatestBlockNumber=0;constructor(t,e){super(t,e)}async init(){await this.loadSnapshot()}async retrieveEventsFromLatestBlock(){await this.blockchainEventEmitter.retrieveEvents(this.latestBlockNumber)}async loadSnapshot(){const t=await this.fetchSnapshot(),e=this.deserializeSnapshot(t);this.populateSnapshot(e),this.blockchainEventEmitter.syncFromAtMost(e.latestBlockNumber),this.savedLatestBlockNumber=e.latestBlockNumber}saveSnapshot(){return this.savedLatestBlockNumber=this.latestBlockNumber,this.persistSnapshot(this.serializeSnapshot({latestBlockNumber:this.latestBlockNumber,payload:this.getSnapshotPayload()}))}async afterEventsAccepted(t){(t>0||this.savedLatestBlockNumber+s.saveDepths[this.chainId]<this.latestBlockNumber)&&await this.saveSnapshot()}}exports.AbstractSnapshotService=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../../constants/save-depths.cjs"),a=require("./AbstractEventService.cjs"),r=require("../../../functions/utils/getSignerFromContract.cjs");class i extends a.AbstractEventService{savedLatestBlockNumber=0;chainId=0;constructor(t,e){super(t,e)}async init(){await this.loadSnapshot();const t=r.getProviderFromContract(this.blockchainEventEmitter.contract);this.chainId=Number((await t.getNetwork()).chainId)}async retrieveEventsFromLatestBlock(){await this.blockchainEventEmitter.retrieveEvents(this.latestBlockNumber)}async loadSnapshot(){const t=await this.fetchSnapshot(),e=this.deserializeSnapshot(t);this.populateSnapshot(e),this.blockchainEventEmitter.syncFromAtMost(e.latestBlockNumber),this.savedLatestBlockNumber=e.latestBlockNumber}saveSnapshot(){return this.savedLatestBlockNumber=this.latestBlockNumber,this.persistSnapshot(this.serializeSnapshot({latestBlockNumber:this.latestBlockNumber,payload:this.getSnapshotPayload()}))}async afterEventsAccepted(t){(t>0||this.savedLatestBlockNumber+s.saveDepths[this.chainId]<this.latestBlockNumber)&&await this.saveSnapshot()}}exports.AbstractSnapshotService=i;

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

@@ -4,8 +4,9 @@ export interface Snapshot<SnapshotPayloadType> {
     readonly latestBlockNumber: number;
     readonly payload: SnapshotPayloadType;
 }
-export declare abstract class AbstractSnapshotService<EventType, SnapshotPayloadType, SerializedSnapshotType> extends AbstractEventService<EventType> {
+export declare abstract class AbstractSnapshotService<EventType, SerializedEventType, SnapshotPayloadType, SerializedSnapshotType> extends AbstractEventService<EventType, SerializedEventType> {
     private savedLatestBlockNumber;
+    private chainId;
     protected constructor(blockchainEventEmitter: BlockchainEventEmitter, eventName: string);
     init(): Promise<void>;
     retrieveEventsFromLatestBlock(): Promise<void>;

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

@@ -1,12 +1,16 @@
 import { saveDepths as e } from "../../../constants/save-depths.mjs";
 import { AbstractEventService as a } from "./AbstractEventService.mjs";
-class r extends a {
+import { getProviderFromContract as o } from "../../../functions/utils/getSignerFromContract.mjs";
+class n extends a {
   savedLatestBlockNumber = 0;
+  chainId = 0;
   constructor(t, s) {
     super(t, s);
   }
   async init() {
     await this.loadSnapshot();
+    const t = o(this.blockchainEventEmitter.contract);
+    this.chainId = Number((await t.getNetwork()).chainId);
   }
   async retrieveEventsFromLatestBlock() {
     await this.blockchainEventEmitter.retrieveEvents(this.latestBlockNumber);
@@ -28,5 +32,5 @@ class r extends a {
   }
 }
 export {
-  r as AbstractSnapshotService
+  n as AbstractSnapshotService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../../../constants/reorg-depths.constants.cjs"),l=require("../../../functions/utils/resolve-sync.utils.cjs"),d=require("../../BlockchainEvent/BlockchainEvent.cjs");class m{_chainId;contract;depositOnChainUtxosContract;_latestBlockNumber;_initialBlockNumber;onEventsProcessed;eventProcessors=new Set;maxPageSize;isReady=!1;isServer;inProgress;eventsFetchingMutex;constructor(e,s,a,t,r,i,o){this.contract=s,this.depositOnChainUtxosContract=o,this._chainId=e,this._initialBlockNumber=a,this.maxPageSize=i,this.isServer=t,this.inProgress=!1,this.eventsFetchingMutex=r}get latestBlockNumber(){return this._latestBlockNumber??this._initialBlockNumber}get chainId(){return this._chainId}syncFromAtMost(e){(this._latestBlockNumber===void 0||e<this._latestBlockNumber)&&(this._latestBlockNumber=e)}intervalClear(){this.isReady=!1,this.eventProcessors=new Set,this.clear()}async init(){if(this.isReady)throw new Error("Already initialized");this.isReady=!0,await this.retrieveEvents(this.latestBlockNumber+1),await this.startUpdateListener()}requireReady(){if(!this.isReady)throw new Error("Not ready")}addEventProcessorFunction(e){if(this.isReady)throw new Error("Can't add event processor after event emitter initialized");this.eventProcessors.add(e)}async getLastBlockNumberForEventRequest(){const e=await this.contract.provider.getBlockNumber();if(!this.isServer)return e;const{chainId:s}=await this.contract.provider.getNetwork();return Math.max(this.latestBlockNumber,e-v.blockReorgDepth[s]+1)}async retrieveEvents(e,s=!1){return this.requireReady(),await this.eventsFetchingMutex.runExclusive(async()=>{try{if(this.inProgress&&!s)return!1;this.inProgress=!0;const t=await this.getLastBlockNumberForEventRequest();if(t<e)return this.inProgress=!1,!1;const r=l.getSequence(e,t,this.maxPageSize),i=[];if(await l.resolveSync(r.map(({from:n,to:c})=>async()=>{const h=await this.contract.queryFilter("*",n,c);i.push(...h)})),this.depositOnChainUtxosContract){const{depositOnChainUtxosContract:n}=this;await l.resolveSync(r.map(({from:c,to:h})=>async()=>{const u=await n.queryFilter("*",c,h);i.push(...u)}))}const o=i.map(n=>d.BlockchainEvent.fromEthers(n));return await this.processEvents(o),this._latestBlockNumber=t,this.inProgress=!1,!0}catch(t){return console.log("retrieveEvents error:",{err:t}),this.inProgress=!1,!1}})}async processEvents(e){const a=(await Promise.all([...this.eventProcessors].map(t=>t(e)))).reduce((t,r)=>t+r,0);this.onEventsProcessed?.(a)}}exports.BlockchainEventEmitter=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("ethers"),y=require("../../../constants/reorg-depths.constants.cjs"),h=require("../../../functions/utils/resolve-sync.utils.cjs"),f=require("../../../functions/utils/mutexes.utils.cjs"),d=require("../../../functions/utils/getSignerFromContract.cjs");class E{contract;depositOnChainUtxosContract;_latestBlockNumber;_initialBlockNumber;onEventsProcessed;eventProcessors=new Set;maxPageSize;isReady=!1;isServer;intervalId;inProgress;eventsFetchingMutex;constructor(e,r,u,s,i,a=f.balanceFetchingMutex){this.contract=e,this.depositOnChainUtxosContract=i,this._initialBlockNumber=r,this.maxPageSize=s,this.isServer=u,this.inProgress=!1,this.eventsFetchingMutex=a}get latestBlockNumber(){return this._latestBlockNumber??this._initialBlockNumber}syncFromAtMost(e){(this._latestBlockNumber===void 0||e<this._latestBlockNumber)&&(this._latestBlockNumber=e)}intervalClear(){this.isReady=!1,this.eventProcessors=new Set,clearInterval(this.intervalId)}async init(){if(this.isReady)throw new Error("Already initialized");this.isReady=!0,await this.retrieveEvents(this.latestBlockNumber+1),this.intervalId=setInterval(async()=>{await this.retrieveEvents(this.latestBlockNumber)},3500)}requireReady(){if(!this.isReady)throw new Error("Not ready")}addEventProcessorFunction(e){if(this.isReady)throw new Error("Can't add event processor after event emitter initialized");this.eventProcessors.add(e)}async getLastBlockNumberForEventRequest(){const e=await d.getProviderFromContract(this.contract).getBlockNumber();if(!this.isServer)return e;const{chainId:r}=await d.getProviderFromContract(this.contract).getNetwork();return Math.max(this.latestBlockNumber,e-y.blockReorgDepth[Number(r)]+1)}async retrieveEvents(e,r=!1){return this.requireReady(),await this.eventsFetchingMutex.runExclusive(async()=>{try{if(this.inProgress&&!r)return!1;this.inProgress=!0;let s=0;const i=await this.getLastBlockNumberForEventRequest();if(i<e)return this.inProgress=!1,!1;const a=h.getSequence(e,i,this.maxPageSize),o=[];if(await h.resolveSync(a.map(({from:t,to:n})=>async()=>{const c=(await this.contract.queryFilter("*",t,n)).filter(l=>l instanceof v.ethers.EventLog);o.push(...c)})),this.depositOnChainUtxosContract){const{depositOnChainUtxosContract:t}=this;await h.resolveSync(a.map(({from:n,to:c})=>async()=>{const l=(await t.queryFilter("*",n,c)).filter(g=>g instanceof v.ethers.EventLog);o.push(...l)}))}const m=await Promise.all([...this.eventProcessors].map(t=>t(o)));return this._latestBlockNumber=i,s+=m.reduce((t,n)=>t+n,0),this.onEventsProcessed?.(s),this.inProgress=!1,!0}catch(s){return console.log("retrieveEvents error:",{err:s}),this.inProgress=!1,!1}})}}exports.BlockchainEventEmitter=E;

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

@@ -1,9 +1,7 @@
 import { ethers } from 'ethers';
 import { Mutex } from 'async-mutex';
-import { EventProcessorFunction } from '../../../types/events.types';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
-export declare abstract class BlockchainEventEmitter {
-    private readonly _chainId;
+export type EventProcessorFunction = (events: ethers.EventLog[]) => Promise<number> | number;
+export declare class BlockchainEventEmitter {
     readonly contract: ethers.Contract;
     readonly depositOnChainUtxosContract?: ethers.Contract;
     private _latestBlockNumber;
@@ -13,11 +11,11 @@ export declare abstract class BlockchainEventEmitter {
     private readonly maxPageSize?;
     private isReady;
     private isServer;
+    private intervalId?;
     private inProgress;
-    protected eventsFetchingMutex: Mutex;
-    constructor(chainId: number, contract: ethers.Contract, initialBlockNumber: number, isServer: boolean, eventsFetchingMutex: Mutex, maxPageSize?: number, depositOnChainUtxosContract?: ethers.Contract);
+    private eventsFetchingMutex;
+    constructor(contract: ethers.Contract, initialBlockNumber: number, isServer: boolean, maxPageSize?: number, depositOnChainUtxosContract?: ethers.Contract, eventsFetchingMutex?: Mutex);
     get latestBlockNumber(): number;
-    get chainId(): number;
     syncFromAtMost(blockNumber: number): void;
     intervalClear(): void;
     init(): Promise<void>;
@@ -25,7 +23,4 @@ export declare abstract class BlockchainEventEmitter {
     addEventProcessorFunction(eventProcessorFunction: EventProcessorFunction): void;
     private getLastBlockNumberForEventRequest;
     retrieveEvents(fromBlockNumber: number, useForce?: boolean): Promise<boolean>;
-    protected processEvents(events: BlockchainEvent[]): Promise<void>;
-    protected abstract clear(): void;
-    protected abstract startUpdateListener(): Promise<void> | void;
 }

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

@@ -1,8 +1,9 @@
-import { blockReorgDepth as v } from "../../../constants/reorg-depths.constants.mjs";
-import { getSequence as d, resolveSync as l } from "../../../functions/utils/resolve-sync.utils.mjs";
-import { BlockchainEvent as m } from "../../BlockchainEvent/BlockchainEvent.mjs";
-class g {
-  _chainId;
+import { ethers as u } from "ethers";
+import { blockReorgDepth as g } from "../../../constants/reorg-depths.constants.mjs";
+import { getSequence as y, resolveSync as v } from "../../../functions/utils/resolve-sync.utils.mjs";
+import { balanceFetchingMutex as E } from "../../../functions/utils/mutexes.utils.mjs";
+import { getProviderFromContract as m } from "../../../functions/utils/getSignerFromContract.mjs";
+class b {
   contract;
   depositOnChainUtxosContract;
   _latestBlockNumber;
@@ -12,28 +13,28 @@ class g {
   maxPageSize;
   isReady = !1;
   isServer;
+  intervalId;
   inProgress;
   // to remove race conditions
   eventsFetchingMutex;
-  constructor(t, s, n, e, r, i, o) {
-    this.contract = s, this.depositOnChainUtxosContract = o, this._chainId = t, this._initialBlockNumber = n, this.maxPageSize = i, this.isServer = e, this.inProgress = !1, this.eventsFetchingMutex = r;
+  constructor(t, r, h, s, i, n = E) {
+    this.contract = t, this.depositOnChainUtxosContract = i, this._initialBlockNumber = r, this.maxPageSize = s, this.isServer = h, this.inProgress = !1, this.eventsFetchingMutex = n;
   }
   get latestBlockNumber() {
     return this._latestBlockNumber ?? this._initialBlockNumber;
   }
-  get chainId() {
-    return this._chainId;
-  }
   syncFromAtMost(t) {
     (this._latestBlockNumber === void 0 || t < this._latestBlockNumber) && (this._latestBlockNumber = t);
   }
   intervalClear() {
-    this.isReady = !1, this.eventProcessors = /* @__PURE__ */ new Set(), this.clear();
+    this.isReady = !1, this.eventProcessors = /* @__PURE__ */ new Set(), clearInterval(this.intervalId);
   }
   async init() {
     if (this.isReady)
       throw new Error("Already initialized");
-    this.isReady = !0, await this.retrieveEvents(this.latestBlockNumber + 1), await this.startUpdateListener();
+    this.isReady = !0, await this.retrieveEvents(this.latestBlockNumber + 1), this.intervalId = setInterval(async () => {
+      await this.retrieveEvents(this.latestBlockNumber);
+    }, 3500);
   }
   requireReady() {
     if (!this.isReady)
@@ -45,50 +46,49 @@ class g {
     this.eventProcessors.add(t);
   }
   async getLastBlockNumberForEventRequest() {
-    const t = await this.contract.provider.getBlockNumber();
+    const t = await m(this.contract).getBlockNumber();
     if (!this.isServer)
       return t;
-    const { chainId: s } = await this.contract.provider.getNetwork();
-    return Math.max(this.latestBlockNumber, t - v[s] + 1);
+    const { chainId: r } = await m(this.contract).getNetwork();
+    return Math.max(this.latestBlockNumber, t - g[Number(r)] + 1);
   }
-  async retrieveEvents(t, s = !1) {
+  async retrieveEvents(t, r = !1) {
     return this.requireReady(), await this.eventsFetchingMutex.runExclusive(async () => {
       try {
-        if (this.inProgress && !s)
+        if (this.inProgress && !r)
           return !1;
         this.inProgress = !0;
-        const e = await this.getLastBlockNumberForEventRequest();
-        if (e < t)
+        let s = 0;
+        const i = await this.getLastBlockNumberForEventRequest();
+        if (i < t)
           return this.inProgress = !1, !1;
-        const r = d(t, e, this.maxPageSize), i = [];
-        if (await l(
-          r.map(({ from: a, to: c }) => async () => {
-            const h = await this.contract.queryFilter("*", a, c);
-            i.push(...h);
+        const n = y(t, i, this.maxPageSize), o = [];
+        if (await v(
+          n.map(({ from: e, to: a }) => async () => {
+            const c = (await this.contract.queryFilter("*", e, a)).filter(
+              (l) => l instanceof u.EventLog
+            );
+            o.push(...c);
           })
         ), this.depositOnChainUtxosContract) {
-          const { depositOnChainUtxosContract: a } = this;
-          await l(
-            r.map(({ from: c, to: h }) => async () => {
-              const u = await a.queryFilter("*", c, h);
-              i.push(...u);
+          const { depositOnChainUtxosContract: e } = this;
+          await v(
+            n.map(({ from: a, to: c }) => async () => {
+              const l = (await e.queryFilter("*", a, c)).filter((f) => f instanceof u.EventLog);
+              o.push(...l);
             })
           );
         }
-        const o = i.map((a) => m.fromEthers(a));
-        return await this.processEvents(o), this._latestBlockNumber = e, this.inProgress = !1, !0;
-      } catch (e) {
-        return console.log("retrieveEvents error:", { err: e }), this.inProgress = !1, !1;
+        const d = await Promise.all(
+          [...this.eventProcessors].map((e) => e(o))
+        );
+        return this._latestBlockNumber = i, s += d.reduce((e, a) => e + a, 0), this.onEventsProcessed?.(s), this.inProgress = !1, !0;
+      } catch (s) {
+        return console.log("retrieveEvents error:", { err: s }), this.inProgress = !1, !1;
       }
     });
   }
-  async processEvents(t) {
-    const n = (await Promise.all(
-      [...this.eventProcessors].map((e) => e(t))
-    )).reduce((e, r) => e + r, 0);
-    this.onEventsProcessed?.(n);
-  }
 }
 export {
-  g as BlockchainEventEmitter
+  b as BlockchainEventEmitter
 };

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

@@ -5,11 +5,7 @@ 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 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;
+"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;

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

@@ -2,7 +2,6 @@ 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;
@@ -18,7 +17,7 @@ export type SolanaAccessTokenSerializedSnapshot = {
     senderAddresses?: string[];
     senderAddressIndexMap?: SolanaSenderAddressIndexMapJson;
 };
-export declare abstract class AbstractSolanaAccessTokenSnapshotService extends AbstractSolanaSnapshotService<SolanaAccessTokenEvent<bigint, string>, SolanaAccessTokenSnapshotPayload, SolanaAccessTokenSerializedSnapshot> {
+export declare abstract class AbstractSolanaAccessTokenSnapshotService extends AbstractSolanaSnapshotService<SolanaAccessTokenEvent<bigint, string>, SolanaAccessTokenEvent<number[], number[]>, SolanaAccessTokenSnapshotPayload, SolanaAccessTokenSerializedSnapshot> {
     constructor(accessTokenEventFetcher: SolanaBlockchainEventEmitter);
     private _merkleTree;
     private _senderAddresses;
@@ -29,7 +28,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: BlockchainEvent): SolanaAccessTokenEvent<bigint, string>;
+    protected mapEvent(event: SolanaAccessTokenEvent<number[], number[]>): 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 c } from "./AbstractSolanaSnapshotService.mjs";
-import { contructMerkleTreeFromSerialized as l } from "../../../functions/utils/merkleTree.utils.mjs";
+import { AbstractSolanaSnapshotService as l } from "./AbstractSolanaSnapshotService.mjs";
+import { contructMerkleTreeFromSerialized as c } from "../../../functions/utils/merkleTree.utils.mjs";
 import { PublicKey as p } from "@solana/web3.js";
-class N extends c {
+class B extends l {
   constructor(e) {
     super(e, "NewAccessKeyAdded");
   }
@@ -40,7 +40,7 @@ class N extends c {
   }
   deserializeSnapshot(e) {
     let s, r;
-    return e.latestBlockNumber && e.merkleTree ? s = l(e.merkleTree) : s = m.create(o, 0n), e.latestBlockNumber && e.senderAddressIndexMap ? r = new Map(
+    return e.latestBlockNumber && e.merkleTree ? s = c(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 N extends c {
     }
   }
   mapEvent(e) {
-    const s = e.getArg("access_key"), r = e.getArg("index"), d = e.getArg("sender_address");
+    const { access_key: s, index: r, sender_address: d } = e;
     return {
       access_key: t(s),
       index: t(r),
@@ -83,5 +83,5 @@ class N extends c {
   }
 }
 export {
-  N as AbstractSolanaAccessTokenSnapshotService
+  B as AbstractSolanaAccessTokenSnapshotService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const p=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=p.MerkleTree.create(m.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 t=e.getArg("commitment"),n=e.getArg("index"),r=e.getArg("encrypted_output"),s=e.getArg("on_chain_data"),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 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;