@hinkal/common 0.2.19 → 0.2.21

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../../constants/protocol.constants.cjs"),a=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const t=require("../../../functions/utils/amounts.utils.cjs"),o=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const l=require("./AbstractSnapshotService.cjs"),i=require("../../../functions/utils/merkleTree.utils.cjs");class u extends l.AbstractSnapshotService{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(a.poseidonFunction,0n),e.latestBlockNumber&&e.senderAddressIndexMap?r=new Map(e.senderAddressIndexMap.map(({address:d,index:n})=>[d,n])):r=new Map,{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:s,senderAddresses:e.senderAddresses??[],senderAddressIndexMap:r}}}acceptEvent(e,s){try{return this._merkleTree.insert(e.accessKey,e.index),this._senderAddressIndexMap.set(e.senderAddress,Math.max(Number(e.index),this._senderAddressIndexMap.get(e.senderAddress)??0)),this._senderAddresses.includes(e.senderAddress)||this._senderAddresses.push(e.senderAddress),e.accessKey===0n&&e.senderAddress===c.zeroAddress&&this._merkleTree.remove(e.index),!0}catch(r){return console.error(r),!1}}mapEvent(e){const{accessKey:s,index:r,senderAddress:d}=e;return{accessKey:t.toBigInt(s),index:t.toBigInt(r),senderAddress:d}}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.AbstractAccessTokenSnapshotService=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../../constants/protocol.constants.cjs"),a=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const t=require("../../../functions/utils/amounts.utils.cjs"),o=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const l=require("./AbstractSnapshotService.cjs"),A=require("../../../functions/utils/merkleTree.utils.cjs");class i extends l.AbstractSnapshotService{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=A.contructMerkleTreeFromSerialized(e.merkleTree):s=o.MerkleTree.create(a.poseidonFunction,0n),e.latestBlockNumber&&e.senderAddressIndexMap?r=new Map(e.senderAddressIndexMap.map(({address:d,index:n})=>[d,n])):r=new Map,{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:s,senderAddresses:e.senderAddresses??[],senderAddressIndexMap:r}}}acceptEvent(e,s){try{return this._merkleTree.insert(e.accessKey,e.index),this._senderAddressIndexMap.set(e.senderAddress,Math.max(Number(e.index),this._senderAddressIndexMap.get(e.senderAddress)??0)),this._senderAddresses.includes(e.senderAddress)||this._senderAddresses.push(e.senderAddress),e.accessKey===0n&&e.senderAddress===c.zeroAddress&&this._merkleTree.remove(e.index),!0}catch(r){return console.error(r),!1}}mapEvent(e){const s=e.getArg("accessKey"),r=e.getArg("index"),d=e.getArg("senderAddress");return{accessKey:t.toBigInt(s),index:t.toBigInt(r),senderAddress:d}}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.AbstractAccessTokenSnapshotService=i;

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

@@ -2,6 +2,7 @@ import { MerkleTree, MerkleTreeJson } from '../../merkle-tree';
 import { AccessTokenEvent } from '../../../types';
 import { AbstractSnapshotService, Snapshot } from './AbstractSnapshotService';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type SenderAddressIndexMapJson = {
     address: string;
     index: number;
@@ -17,7 +18,7 @@ export type AccessTokenSerializedSnapshot = {
     senderAddresses?: string[];
     senderAddressIndexMap?: SenderAddressIndexMapJson;
 };
-export declare abstract class AbstractAccessTokenSnapshotService extends AbstractSnapshotService<AccessTokenEvent<bigint>, AccessTokenEvent, AccessTokenSnapshotPayload, AccessTokenSerializedSnapshot> {
+export declare abstract class AbstractAccessTokenSnapshotService extends AbstractSnapshotService<AccessTokenEvent<bigint>, AccessTokenSnapshotPayload, AccessTokenSerializedSnapshot> {
     constructor(accessTokenEventFetcher: BlockchainEventEmitter);
     private _merkleTree;
     private _senderAddresses;
@@ -28,7 +29,7 @@ export declare abstract class AbstractAccessTokenSnapshotService extends Abstrac
     protected serializeSnapshot(snapshot: Snapshot<AccessTokenSnapshotPayload>): AccessTokenSerializedSnapshot;
     protected deserializeSnapshot(serializedSnapshot: AccessTokenSerializedSnapshot): Snapshot<AccessTokenSnapshotPayload>;
     protected acceptEvent(event: AccessTokenEvent<bigint>, _blockNumber: number): boolean;
-    protected mapEvent(event: AccessTokenEvent): AccessTokenEvent<bigint>;
+    protected mapEvent(event: BlockchainEvent): AccessTokenEvent<bigint>;
     protected getSnapshotPayload(): AccessTokenSnapshotPayload;
     protected populateSnapshot({ payload: { merkleTree, senderAddresses, senderAddressIndexMap }, }: Snapshot<AccessTokenSnapshotPayload>): void;
 }

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

@@ -1,5 +1,5 @@
-import { zeroAddress as m } from "../../../constants/protocol.constants.mjs";
-import { poseidonFunction as o } from "../../../crypto/poseidon.mjs";
+import { zeroAddress as o } from "../../../constants/protocol.constants.mjs";
+import { poseidonFunction as m } from "../../../crypto/poseidon.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
@@ -8,9 +8,9 @@ import { toBigInt as t } from "../../../functions/utils/amounts.utils.mjs";
 import { MerkleTree as a } from "../../merkle-tree/MerkleTree.mjs";
 import "ethers";
 import "../../../error-handling/error-codes.constants.mjs";
-import { AbstractSnapshotService as l } from "./AbstractSnapshotService.mjs";
-import { contructMerkleTreeFromSerialized as A } from "../../../functions/utils/merkleTree.utils.mjs";
-class b extends l {
+import { AbstractSnapshotService as A } from "./AbstractSnapshotService.mjs";
+import { contructMerkleTreeFromSerialized as c } from "../../../functions/utils/merkleTree.utils.mjs";
+class g extends A {
   constructor(e) {
     super(e, "NewAccessKeyAdded");
   }
@@ -39,7 +39,7 @@ class b extends l {
   }
   deserializeSnapshot(e) {
     let s, r;
-    return e.latestBlockNumber && e.merkleTree ? s = A(e.merkleTree) : s = a.create(o, 0n), e.latestBlockNumber && e.senderAddressIndexMap ? r = new Map(
+    return e.latestBlockNumber && e.merkleTree ? s = c(e.merkleTree) : s = a.create(m, 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,
@@ -55,13 +55,13 @@ class b extends l {
       return this._merkleTree.insert(e.accessKey, e.index), this._senderAddressIndexMap.set(
         e.senderAddress,
         Math.max(Number(e.index), this._senderAddressIndexMap.get(e.senderAddress) ?? 0)
-      ), this._senderAddresses.includes(e.senderAddress) || this._senderAddresses.push(e.senderAddress), e.accessKey === 0n && e.senderAddress === m && this._merkleTree.remove(e.index), !0;
+      ), this._senderAddresses.includes(e.senderAddress) || this._senderAddresses.push(e.senderAddress), e.accessKey === 0n && e.senderAddress === o && this._merkleTree.remove(e.index), !0;
     } catch (r) {
       return console.error(r), !1;
     }
   }
   mapEvent(e) {
-    const { accessKey: s, index: r, senderAddress: d } = e;
+    const s = e.getArg("accessKey"), r = e.getArg("index"), d = e.getArg("senderAddress");
     return {
       accessKey: t(s),
       index: t(r),
@@ -82,5 +82,5 @@ class b extends l {
   }
 }
 export {
-  b as AbstractAccessTokenSnapshotService
+  g as AbstractAccessTokenSnapshotService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./AbstractSnapshotService.cjs"),v=require("../../../functions/utils/amounts.utils.cjs"),u=require("../../../functions/utils/caseInsensitive.utils.cjs");class A extends c.AbstractSnapshotService{constructor(e){super(e,"NewApprovedUtxo")}_approvals=new Map;events=new Set;get approvals(){return this._approvals}getEventKey(e,t,s){return typeof e!="bigint"||typeof s!="string"||typeof t!="string"?null:`${s}-${t}-${e}`}serializeSnapshot(e){const t=Object.fromEntries(e.payload.approvals),s=Object.entries(t).map(([p,i])=>{const l=i.map(n=>({amount:n.amount.toString(),tokenAddress:n.tokenAddress,inHinkalAddress:n.inHinkalAddress.toString()}));return[p,l]}),r=Object.fromEntries(s);return{latestBlockNumber:e.latestBlockNumber,approvals:r,events:[...this.events]}}deserializeSnapshot(e){const t=e.approvals,s=Object.entries(t).map(([p,i])=>{const l=i.map(n=>({amount:BigInt(n.amount),tokenAddress:n.tokenAddress,inHinkalAddress:BigInt(n.inHinkalAddress)}));return[p,l]}),r=new Map(s);return{latestBlockNumber:e.latestBlockNumber??0,payload:{approvals:r,events:new Set(e.events)}}}getSnapshotPayload(){return{approvals:this._approvals,events:this.events}}populateSnapshot({payload:{approvals:e,events:t}}){this._approvals=e,this.events=t}mapEvent(e){const{approveTo:t,tokenAddress:s,amount:r,inHinkalAddress:p}=e;return{approveTo:t,tokenAddress:s,amount:v.toBigInt(r),inHinkalAddress:v.toBigInt(p)}}acceptEvent(e,t,s){const r=this.getEventKey(e.inHinkalAddress,e.tokenAddress,s);if(r&&!this.events.has(r)){const{amount:p,tokenAddress:i,inHinkalAddress:l}=e,n={amount:p,tokenAddress:i,inHinkalAddress:l};let a=this.approvals.get(e.approveTo)||[],d=!1;for(let o=0;o<a.length;o+=1)u.caseInsensitiveEqual(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{const o=d?a:[...a,n];this.approvals.set(e.approveTo,o)}return s&&this.events.add(r),!0}return!1}}exports.AbstractApprovalsSnapshotService=A;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("./AbstractSnapshotService.cjs"),c=require("../../../functions/utils/amounts.utils.cjs"),u=require("../../../functions/utils/caseInsensitive.utils.cjs");class A extends v.AbstractSnapshotService{constructor(e){super(e,"NewApprovedUtxo")}_approvals=new Map;events=new Set;get approvals(){return this._approvals}getEventKey(e,t,s){return typeof e!="bigint"||typeof s!="string"||typeof t!="string"?null:`${s}-${t}-${e}`}serializeSnapshot(e){const t=Object.fromEntries(e.payload.approvals),s=Object.entries(t).map(([p,i])=>{const l=i.map(n=>({amount:n.amount.toString(),tokenAddress:n.tokenAddress,inHinkalAddress:n.inHinkalAddress.toString()}));return[p,l]}),r=Object.fromEntries(s);return{latestBlockNumber:e.latestBlockNumber,approvals:r,events:[...this.events]}}deserializeSnapshot(e){const t=e.approvals,s=Object.entries(t).map(([p,i])=>{const l=i.map(n=>({amount:BigInt(n.amount),tokenAddress:n.tokenAddress,inHinkalAddress:BigInt(n.inHinkalAddress)}));return[p,l]}),r=new Map(s);return{latestBlockNumber:e.latestBlockNumber??0,payload:{approvals:r,events:new Set(e.events)}}}getSnapshotPayload(){return{approvals:this._approvals,events:this.events}}populateSnapshot({payload:{approvals:e,events:t}}){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");return{approveTo:t,tokenAddress:s,amount:c.toBigInt(r),inHinkalAddress:c.toBigInt(p)}}acceptEvent(e,t,s){const r=this.getEventKey(e.inHinkalAddress,e.tokenAddress,s);if(r&&!this.events.has(r)){const{amount:p,tokenAddress:i,inHinkalAddress:l}=e,n={amount:p,tokenAddress:i,inHinkalAddress:l};let a=this.approvals.get(e.approveTo)||[],d=!1;for(let o=0;o<a.length;o+=1)u.caseInsensitiveEqual(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{const o=d?a:[...a,n];this.approvals.set(e.approveTo,o)}return s&&this.events.add(r),!0}return!1}}exports.AbstractApprovalsSnapshotService=A;

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

@@ -2,6 +2,7 @@ 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>;
@@ -11,7 +12,7 @@ export type ApprovalsSerializedSnapshot = {
     approvals: Record<string, ApprovedUtxo<string>[]>;
     events: string[];
 };
-export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, NewApprovedUtxoEvent<string>, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
+export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _approvals;
     events: Set<string>;
@@ -24,6 +25,6 @@ export declare abstract class AbstractApprovalsSnapshotService extends AbstractS
         events: Set<string>;
     };
     protected populateSnapshot({ payload: { approvals, events } }: Snapshot<ApprovalsSnapshotPayload>): void;
-    protected mapEvent(event: NewApprovedUtxoEvent<string>): NewApprovedUtxoEvent;
+    protected mapEvent(event: BlockchainEvent): 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 u } from "../../../functions/utils/caseInsensitive.utils.mjs";
-class g extends c {
+import { caseInsensitiveEqual as A } from "../../../functions/utils/caseInsensitive.utils.mjs";
+class f extends c {
   constructor(e) {
     super(e, "NewApprovedUtxo");
   }
@@ -57,7 +57,7 @@ class g extends c {
     this._approvals = e, this.events = t;
   }
   mapEvent(e) {
-    const { approveTo: t, tokenAddress: s, amount: r, inHinkalAddress: p } = e;
+    const t = e.getArg("approveTo"), s = e.getArg("tokenAddress"), r = e.getArg("amount"), p = e.getArg("inHinkalAddress");
     return {
       approveTo: t,
       tokenAddress: s,
@@ -75,7 +75,7 @@ class g extends c {
       };
       let a = this.approvals.get(e.approveTo) || [], d = !1;
       for (let o = 0; o < a.length; o += 1)
-        u(i, a[o].tokenAddress) && l === a[o].inHinkalAddress && (a[o].amount += p, d = !0);
+        A(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 g extends c {
   }
 }
 export {
-  g as AbstractApprovalsSnapshotService
+  f as AbstractApprovalsSnapshotService
 };

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

@@ -1 +1 @@
-"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;
+"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;

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

@@ -2,6 +2,7 @@ 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[];
@@ -11,7 +12,7 @@ export type CommitmentsSerializedSnapshot = {
     merkleTree?: MerkleTreeJson;
     encryptedOutputs?: EncryptedOutputWithSign<string>[];
 };
-export declare abstract class AbstractCommitmentsSnapshotService extends AbstractSnapshotService<CommitmentEvent<bigint>, CommitmentEvent, CommitmentsSnapshotPayload, CommitmentsSerializedSnapshot> {
+export declare abstract class AbstractCommitmentsSnapshotService extends AbstractSnapshotService<CommitmentEvent<bigint>, CommitmentsSnapshotPayload, CommitmentsSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _merkleTree;
     private _encryptedOutputs;
@@ -24,6 +25,6 @@ export declare abstract class AbstractCommitmentsSnapshotService extends Abstrac
         encryptedOutputs: EncryptedOutputWithSign<boolean>[];
     };
     protected populateSnapshot({ payload: { merkleTree, encryptedOutputs }, }: Snapshot<CommitmentsSnapshotPayload>): void;
-    protected mapEvent(event: CommitmentEvent): CommitmentEvent<bigint>;
+    protected mapEvent(event: BlockchainEvent): 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 m } from "../../../crypto/poseidon.mjs";
+import { poseidonFunction as c } from "../../../crypto/poseidon.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-import { MerkleTree as c } from "../../merkle-tree/MerkleTree.mjs";
+import { MerkleTree as m } 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 b extends o {
+class x extends o {
   constructor(e) {
     super(e, "NewCommitment");
   }
@@ -34,7 +34,7 @@ class b extends o {
   }
   deserializeSnapshot(e) {
     let t;
-    e.latestBlockNumber && e.merkleTree ? t = n(e.merkleTree) : t = c.create(m, 0n);
+    e.latestBlockNumber && e.merkleTree ? t = n(e.merkleTree) : t = m.create(c, 0n);
     const s = e.encryptedOutputs?.map((r) => ({
       value: r.value,
       isPositive: JSON.parse(r.isPositive),
@@ -60,7 +60,7 @@ class b extends o {
     this._merkleTree = e, this._encryptedOutputs = t;
   }
   mapEvent(e) {
-    const { commitment: t, index: s, encryptedOutput: r } = e;
+    const t = e.getArg("commitment"), s = e.getArg("index"), r = e.getArg("encryptedOutput");
     return {
       commitment: p(t),
       index: p(s),
@@ -82,5 +82,5 @@ class b extends o {
   }
 }
 export {
-  b as AbstractCommitmentsSnapshotService
+  x 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 v{blockchainEventEmitter;eventName;constructor(t,e){this.blockchainEventEmitter=t,this.eventName=e,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 e=new Set;t.forEach(({event:s,transactionHash:n})=>{s==="BlockedUtxosCreated"&&e.add(n)});const c=[];await l.resolveSync(t.map(s=>async()=>{if(s.event!==this.eventName)return;const{args:n,blockNumber:o,transactionHash:r}=s;if(!n)throw new Error("Wrong event structure");const a=this.mapEvent(n),h=e.has(r);await this.acceptEvent(a,o,r,h)&&c.push(a)}));const i=c.length;return await this.afterEventsAccepted(i),c.length}}exports.AbstractEventService=v;
+"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;

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
-import { BigNumber } from 'ethers';
 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 +9,14 @@ export type NullifierSerializedSnapshot = {
     latestBlockNumber?: number;
     nullifiers?: string[];
 };
-export declare abstract class AbstractNullifierSnapshotService extends AbstractSnapshotService<NullifierEvent<string>, NullifierEvent<BigNumber>, NullifierSnapshotPayload, NullifierSerializedSnapshot> {
+export declare abstract class AbstractNullifierSnapshotService extends AbstractSnapshotService<NullifierEvent<string>, 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: NullifierEvent<BigNumber>): NullifierEvent<string>;
+    protected mapEvent(event: BlockchainEvent): NullifierEvent<string>;
     protected getSnapshotPayload(): NullifierSnapshotPayload;
     protected populateSnapshot({ payload: { nullifiers } }: Snapshot<NullifierSnapshotPayload>): void;
 }

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

@@ -1,5 +1,6 @@
-import { AbstractSnapshotService as i } from "./AbstractSnapshotService.mjs";
-class n extends i {
+import { BigNumber as i } from "ethers";
+import { AbstractSnapshotService as t } from "./AbstractSnapshotService.mjs";
+class a extends t {
   constructor(r) {
     super(r, "Nullified");
   }
@@ -29,9 +30,9 @@ class n extends i {
     }
   }
   mapEvent(r) {
-    const { nullifier: e } = r;
+    const e = r.getArg("nullifier");
     return {
-      nullifier: e.toHexString()
+      nullifier: i.from(e).toHexString()
     };
   }
   getSnapshotPayload() {
@@ -44,5 +45,5 @@ class n extends i {
   }
 }
 export {
-  n as AbstractNullifierSnapshotService
+  a as AbstractNullifierSnapshotService
 };

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

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

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("../../../constants/reorg-depths.constants.cjs"),l=require("../../../functions/utils/resolve-sync.utils.cjs");class m{_chainId;contract;depositOnChainUtxosContract;_latestBlockNumber;_initialBlockNumber;onEventsProcessed;eventProcessors=new Set;maxPageSize;isReady=!1;isServer;intervalId;inProgress;eventsFetchingMutex;constructor(e,r,h,s,i,o,n){this.contract=r,this.depositOnChainUtxosContract=n,this._chainId=e,this._initialBlockNumber=h,this.maxPageSize=o,this.isServer=s,this.inProgress=!1,this.eventsFetchingMutex=i}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,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 this.contract.provider.getBlockNumber();if(!this.isServer)return e;const{chainId:r}=await this.contract.provider.getNetwork();return Math.max(this.latestBlockNumber,e-d.blockReorgDepth[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 o=l.getSequence(e,i,this.maxPageSize),n=[];if(await l.resolveSync(o.map(({from:t,to:a})=>async()=>{const c=await this.contract.queryFilter("*",t,a);n.push(...c)})),this.depositOnChainUtxosContract){const{depositOnChainUtxosContract:t}=this;await l.resolveSync(o.map(({from:a,to:c})=>async()=>{const v=await t.queryFilter("*",a,c);n.push(...v)}))}const u=await Promise.all([...this.eventProcessors].map(t=>t(n)));return this._latestBlockNumber=i,s+=u.reduce((t,a)=>t+a,0),this.onEventsProcessed?.(s),this.inProgress=!1,!0}catch(s){return console.log("retrieveEvents error:",{err:s}),this.inProgress=!1,!1}})}}exports.BlockchainEventEmitter=m;
+"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;

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

@@ -1,7 +1,8 @@
 import { ethers } from 'ethers';
 import { Mutex } from 'async-mutex';
-export type EventProcessorFunction = (events: ethers.Event[]) => Promise<number> | number;
-export declare class BlockchainEventEmitter {
+import { EventProcessorFunction } from '../../../types/events.types';
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
+export declare abstract class BlockchainEventEmitter {
     private readonly _chainId;
     readonly contract: ethers.Contract;
     readonly depositOnChainUtxosContract?: ethers.Contract;
@@ -12,9 +13,8 @@ export declare class BlockchainEventEmitter {
     private readonly maxPageSize?;
     private isReady;
     private isServer;
-    private intervalId?;
     private inProgress;
-    private eventsFetchingMutex;
+    protected eventsFetchingMutex: Mutex;
     constructor(chainId: number, contract: ethers.Contract, initialBlockNumber: number, isServer: boolean, eventsFetchingMutex: Mutex, maxPageSize?: number, depositOnChainUtxosContract?: ethers.Contract);
     get latestBlockNumber(): number;
     get chainId(): number;
@@ -25,4 +25,7 @@ export declare 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,6 +1,7 @@
-import { blockReorgDepth as d } from "../../../constants/reorg-depths.constants.mjs";
-import { getSequence as m, resolveSync as h } from "../../../functions/utils/resolve-sync.utils.mjs";
-class k {
+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;
   contract;
   depositOnChainUtxosContract;
@@ -11,12 +12,11 @@ class k {
   maxPageSize;
   isReady = !1;
   isServer;
-  intervalId;
   inProgress;
   // to remove race conditions
   eventsFetchingMutex;
-  constructor(t, r, l, s, i, o, a) {
-    this.contract = r, this.depositOnChainUtxosContract = a, this._chainId = t, this._initialBlockNumber = l, this.maxPageSize = o, this.isServer = s, this.inProgress = !1, this.eventsFetchingMutex = i;
+  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;
   }
   get latestBlockNumber() {
     return this._latestBlockNumber ?? this._initialBlockNumber;
@@ -28,14 +28,12 @@ class k {
     (this._latestBlockNumber === void 0 || t < this._latestBlockNumber) && (this._latestBlockNumber = t);
   }
   intervalClear() {
-    this.isReady = !1, this.eventProcessors = /* @__PURE__ */ new Set(), clearInterval(this.intervalId);
+    this.isReady = !1, this.eventProcessors = /* @__PURE__ */ new Set(), this.clear();
   }
   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);
+    this.isReady = !0, await this.retrieveEvents(this.latestBlockNumber + 1), await this.startUpdateListener();
   }
   requireReady() {
     if (!this.isReady)
@@ -50,44 +48,47 @@ class k {
     const t = await this.contract.provider.getBlockNumber();
     if (!this.isServer)
       return t;
-    const { chainId: r } = await this.contract.provider.getNetwork();
-    return Math.max(this.latestBlockNumber, t - d[r] + 1);
+    const { chainId: s } = await this.contract.provider.getNetwork();
+    return Math.max(this.latestBlockNumber, t - v[s] + 1);
   }
-  async retrieveEvents(t, r = !1) {
+  async retrieveEvents(t, s = !1) {
     return this.requireReady(), await this.eventsFetchingMutex.runExclusive(async () => {
       try {
-        if (this.inProgress && !r)
+        if (this.inProgress && !s)
           return !1;
         this.inProgress = !0;
-        let s = 0;
-        const i = await this.getLastBlockNumberForEventRequest();
-        if (i < t)
+        const e = await this.getLastBlockNumberForEventRequest();
+        if (e < t)
           return this.inProgress = !1, !1;
-        const o = m(t, i, this.maxPageSize), a = [];
-        if (await h(
-          o.map(({ from: e, to: n }) => async () => {
-            const c = await this.contract.queryFilter("*", e, n);
-            a.push(...c);
+        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);
           })
         ), this.depositOnChainUtxosContract) {
-          const { depositOnChainUtxosContract: e } = this;
-          await h(
-            o.map(({ from: n, to: c }) => async () => {
-              const v = await e.queryFilter("*", n, c);
-              a.push(...v);
+          const { depositOnChainUtxosContract: a } = this;
+          await l(
+            r.map(({ from: c, to: h }) => async () => {
+              const u = await a.queryFilter("*", c, h);
+              i.push(...u);
             })
           );
         }
-        const u = await Promise.all(
-          [...this.eventProcessors].map((e) => e(a))
-        );
-        return this._latestBlockNumber = i, s += u.reduce((e, n) => e + n, 0), this.onEventsProcessed?.(s), this.inProgress = !1, !0;
-      } catch (s) {
-        return console.log("retrieveEvents error:", { err: s }), this.inProgress = !1, !1;
+        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;
       }
     });
   }
+  async processEvents(t) {
+    const n = (await Promise.all(
+      [...this.eventProcessors].map((e) => e(t))
+    )).reduce((e, r) => e + r, 0);
+    this.onEventsProcessed?.(n);
+  }
 }
 export {
-  k as BlockchainEventEmitter
+  g as BlockchainEventEmitter
 };

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./BlockchainEventEmitter.cjs"),a=require("../helpers/ClientEventHelper.cjs");class E extends c.BlockchainEventEmitter{clientEventHelper;constructor(e,t,n,i,r,l,s){super(t,n,i,!1,r,l,s),this.clientEventHelper=new a.ClientEventHelper(t,e)}clear(){this.clientEventHelper.clear()}startUpdateListener(){this.clientEventHelper.startUpdateListener(async e=>{await this.eventsFetchingMutex.runExclusive(async()=>{await this.processEvents(e)})})}}exports.ClientBlockchainEventEmitter=E;

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

@@ -0,0 +1,11 @@
+import { ethers } from 'ethers';
+import { EventCategory } from '../../../types/events.types';
+import { BlockchainEventEmitter } from './BlockchainEventEmitter';
+import { Mutex } from 'async-mutex';
+import { ClientEventHelper } from '../helpers/ClientEventHelper';
+export declare class ClientBlockchainEventEmitter extends BlockchainEventEmitter {
+    clientEventHelper: ClientEventHelper;
+    constructor(eventCategory: EventCategory, chainId: number, contract: ethers.Contract, initialBlockNumber: number, eventsFetchingMutex: Mutex, maxPageSize?: number, depositOnChainUtxosContract?: ethers.Contract);
+    protected clear(): void;
+    protected startUpdateListener(): Promise<void> | void;
+}

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

@@ -0,0 +1,21 @@
+import { BlockchainEventEmitter as c } from "./BlockchainEventEmitter.mjs";
+import { ClientEventHelper as a } from "../helpers/ClientEventHelper.mjs";
+class v extends c {
+  clientEventHelper;
+  constructor(e, t, n, r, i, s, l) {
+    super(t, n, r, !1, i, s, 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);
+      });
+    });
+  }
+}
+export {
+  v 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(): Promise<void> | void;
+}