@hinkal/common 0.2.21 → 0.2.23

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

@@ -1,8 +1,7 @@
 import { MerkleTree, MerkleTreeJson } from '../../merkle-tree';
-import { CommitmentEvent, EncryptedOutputWithSign } from '../../../types';
+import { CommitmentEvent, EncryptedOutputWithSign, SolanaCommitmentEvent } from '../../../types';
 import { AbstractSolanaSnapshotService, SolanaSnapshot } from './AbstractSolanaSnapshotService';
 import { SolanaBlockchainEventEmitter } from './SolanaBlockchainEventEmitter';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type SolanaCommitmentsSnapshotPayload = {
     readonly merkleTree: MerkleTree<bigint>;
     readonly encryptedOutputs: EncryptedOutputWithSign[];
@@ -12,7 +11,7 @@ export type SolanaCommitmentsSerializedSnapshot = {
     merkleTree?: MerkleTreeJson;
     encryptedOutputs?: EncryptedOutputWithSign<string>[];
 };
-export declare abstract class AbstractSolanaCommitmentsSnapshotService extends AbstractSolanaSnapshotService<CommitmentEvent<bigint>, SolanaCommitmentsSnapshotPayload, SolanaCommitmentsSerializedSnapshot> {
+export declare abstract class AbstractSolanaCommitmentsSnapshotService extends AbstractSolanaSnapshotService<CommitmentEvent<bigint>, SolanaCommitmentEvent, SolanaCommitmentsSnapshotPayload, SolanaCommitmentsSerializedSnapshot> {
     constructor(solanaEventEmitter: SolanaBlockchainEventEmitter);
     private _merkleTree;
     private _encryptedOutputs;
@@ -25,6 +24,6 @@ export declare abstract class AbstractSolanaCommitmentsSnapshotService extends A
         encryptedOutputs: EncryptedOutputWithSign<boolean>[];
     };
     protected populateSnapshot({ payload: { merkleTree, encryptedOutputs }, }: SolanaSnapshot<SolanaCommitmentsSnapshotPayload>): void;
-    protected mapEvent(event: BlockchainEvent): Promise<CommitmentEvent<bigint>>;
+    protected mapEvent(event: SolanaCommitmentEvent): Promise<CommitmentEvent<bigint>>;
     protected acceptEvent(event: CommitmentEvent<bigint>, _slot: number, _signature?: string, isBlocked?: boolean): boolean;
 }

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

@@ -6,11 +6,11 @@ import "buffer";
 import { MerkleTree as a } from "../../merkle-tree/MerkleTree.mjs";
 import "ethers";
 import "../../../error-handling/error-codes.constants.mjs";
-import { advancedToBigInt as c } from "../../../functions/utils/amounts.utils.mjs";
+import { advancedToBigInt as u } from "../../../functions/utils/amounts.utils.mjs";
 import { AbstractSolanaSnapshotService as l } from "./AbstractSolanaSnapshotService.mjs";
 import { contructMerkleTreeFromSerialized as d } from "../../../functions/utils/merkleTree.utils.mjs";
 import { encodeSolanaOnChainUtxo as y, isSolanaOnChainUtxo as O } from "../../crypto-keys/decodeUTXO.mjs";
-class P extends l {
+class I extends l {
   constructor(e) {
     super(e, "NewCommitment");
   }
@@ -61,20 +61,20 @@ class P extends l {
     this._merkleTree = e, this._encryptedOutputs = t;
   }
   async mapEvent(e) {
-    const t = e.getArg("commitment"), n = e.getArg("index"), r = e.getArg("encrypted_output"), i = e.getArg("on_chain_data"), s = c(t), o = c(n);
+    const { commitment: t, index: n, encrypted_output: r, on_chain_data: i } = e, s = u(t), o = u(n);
     if (r.length === 0) {
-      const u = y(i);
+      const m = y(i);
       return {
         commitment: s,
         index: o,
-        encryptedOutput: u
+        encryptedOutput: m
       };
     }
-    const m = `0x${Buffer.from(r).toString("hex")}`;
+    const c = `0x${Buffer.from(r).toString("hex")}`;
     return {
       commitment: s,
       index: o,
-      encryptedOutput: m
+      encryptedOutput: c
     };
   }
   acceptEvent(e, t, n, r) {
@@ -92,5 +92,5 @@ class P extends l {
   }
 }
 export {
-  P as AbstractSolanaCommitmentsSnapshotService
+  I as AbstractSolanaCommitmentsSnapshotService
 };

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@coral-xyz/anchor"),d=require("../../../functions/utils/resolve-sync.utils.cjs"),l=require("../../../error-handling/logger.cjs"),m=require("../../BlockchainEvent/BlockchainEvent.cjs"),g=1e3;class S{_chainId;connection;programId;_latestSlot;_initialSlot;onEventsProcessed;eventProcessors=new Set;maxPageSize;isReady=!1;isServer;inProgress;anchorParser;eventsFetchingMutex;constructor(e,s,a,t,r,c,o){this._chainId=e,this.connection=s,this.programId=a,this._initialSlot=t,this.maxPageSize=o,this.isServer=r,this.inProgress=!1,this.eventsFetchingMutex=c}get chainId(){return this._chainId}get latestBlockNumber(){return this._latestSlot??this._initialSlot}setIdl(e){try{const s=new u.BorshCoder(e);this.anchorParser=new u.EventParser(this.programId,s)}catch(s){l.Logger.error("Failed to initialize Anchor EventParser:",s),this.anchorParser=void 0}}syncFromAtMost(e){(this._latestSlot===void 0||e<this._latestSlot)&&(this._latestSlot=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 getLastSlotForEventRequest(){const e=await this.connection.getSlot();return this.isServer?Math.max(this.latestBlockNumber,e-32+1):e}async retrieveEvents(e,s=!1){const a=e;return this.requireReady(),await this.eventsFetchingMutex.runExclusive(async()=>{try{if(this.inProgress&&!s)return!1;this.inProgress=!0;const r=await this.getLastSlotForEventRequest();if(r<a)return this.inProgress=!1,!1;const c=d.getSequence(a,r,this.maxPageSize),o=[];await d.resolveSync(c.map(({from:n,to:i})=>async()=>{const v=await this.getProgramEvents(n,i);o.push(...v)}));const h=o.map(n=>m.BlockchainEvent.fromSolanaEvent(n));return await this.processEvents(h),this._latestSlot=r,this.inProgress=!1,!0}catch(r){return l.Logger.error("retrieveEvents error:",r),this.inProgress=!1,!1}})}async getProgramEvents(e,s){const a=[];try{const t=await this.connection.getSignaturesForAddress(this.programId,{limit:g,before:void 0});let r=t.length;for(;r>=g;){const n=t[t.length-1],i=await this.connection.getSignaturesForAddress(this.programId,{limit:g,before:n.signature});if(i.length===0)break;t.push(...i),r=i.length}const o=t.filter(n=>n.slot>=e&&n.slot<=s).map(async n=>{try{const i=await this.connection.getTransaction(n.signature,{commitment:"confirmed",maxSupportedTransactionVersion:0});return i&&i.meta&&i.meta.logMessages?this.parseLogsForEvents(i.meta.logMessages,n.signature,n.slot,i.blockTime||null):[]}catch(i){return l.Logger.error(`Failed to get transaction ${n.signature}:`,i),[]}}),h=await Promise.all(o);a.push(...h.flat())}catch(t){l.Logger.error("Error getting program events:",t)}return a}parseLogsForEvents(e,s,a,t){if(!this.anchorParser)return[];try{return Array.from(this.anchorParser.parseLogs(e)).map(({name:c,data:o})=>({signature:s,slot:a,blockTime:t||0,programId:this.programId,data:o,eventName:c}))}catch(r){return l.Logger.error("Anchor EventParser failed; falling back to generic parsing:",r),[]}}async processEvents(e){const a=(await Promise.all([...this.eventProcessors].map(t=>t(e)))).reduce((t,r)=>t+r,0);this.onEventsProcessed?.(a)}}exports.SolanaBlockchainEventEmitter=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("@coral-xyz/anchor"),m=require("../../../functions/utils/resolve-sync.utils.cjs"),p=require("../../../functions/utils/mutexes.utils.cjs"),l=require("../../../error-handling/logger.cjs"),g=require("../../../constants/chains.constants.cjs"),f=require("../../../functions/utils/caseInsensitive.utils.cjs"),d=1e3;class y{connection;programId;_latestSlot;_initialSlot;onEventsProcessed;eventProcessors=new Set;maxPageSize;isReady=!1;isServer;intervalId;inProgress;anchorParser;eventsFetchingMutex;constructor(e,r,a,s,n,o=p.balanceFetchingMutex){this.connection=e,this.programId=r,this._initialSlot=a,this.maxPageSize=n,this.isServer=s,this.inProgress=!1,this.eventsFetchingMutex=o}get latestBlockNumber(){return this._latestSlot??this._initialSlot}setIdl(e){try{const r=new v.BorshCoder(e);this.anchorParser=new v.EventParser(this.programId,r)}catch(r){l.Logger.error("Failed to initialize Anchor EventParser:",r),this.anchorParser=void 0}}syncFromAtMost(e){(this._latestSlot===void 0||e<this._latestSlot)&&(this._latestSlot=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")}get chainId(){const e=this.connection.rpcEndpoint;return f.caseInsensitiveEqual(e,g.networkRegistry[g.chainIds.solanaMainnet].fetchRpcUrl)?g.chainIds.solanaMainnet:g.chainIds.solanaLocalnet}addEventProcessorFunction(e){if(this.isReady)throw new Error("Can't add event processor after event emitter initialized");this.eventProcessors.add(e)}async getLastSlotForEventRequest(){const e=await this.connection.getSlot();return this.isServer?Math.max(this.latestBlockNumber,e-32+1):e}async retrieveEvents(e,r=!1){const a=e;return this.requireReady(),await this.eventsFetchingMutex.runExclusive(async()=>{try{if(this.inProgress&&!r)return!1;this.inProgress=!0;let n=0;const o=await this.getLastSlotForEventRequest();if(o<a)return this.inProgress=!1,!1;const c=m.getSequence(a,o,this.maxPageSize),h=[];await m.resolveSync(c.map(({from:t,to:u})=>async()=>{const S=await this.getProgramEvents(t,u);h.push(...S)}));const i=await Promise.all([...this.eventProcessors].map(t=>t(h)));return this._latestSlot=o,n+=i.reduce((t,u)=>t+u,0),this.onEventsProcessed?.(n),this.inProgress=!1,!0}catch(n){return l.Logger.error("retrieveEvents error:",n),this.inProgress=!1,!1}})}async getProgramEvents(e,r){const a=[];try{const s=await this.connection.getSignaturesForAddress(this.programId,{limit:d,before:void 0});let n=s.length;for(;n>=d;){const i=s[s.length-1],t=await this.connection.getSignaturesForAddress(this.programId,{limit:d,before:i.signature});if(t.length===0)break;s.push(...t),n=t.length}const c=s.filter(i=>i.slot>=e&&i.slot<=r).map(async i=>{try{const t=await this.connection.getTransaction(i.signature,{commitment:"confirmed",maxSupportedTransactionVersion:0});return t&&t.meta&&t.meta.logMessages?this.parseLogsForEvents(t.meta.logMessages,i.signature,i.slot,t.blockTime||null):[]}catch(t){return l.Logger.error(`Failed to get transaction ${i.signature}:`,t),[]}}),h=await Promise.all(c);a.push(...h.flat())}catch(s){l.Logger.error("Error getting program events:",s)}return a}parseLogsForEvents(e,r,a,s){if(!this.anchorParser)return[];try{return Array.from(this.anchorParser.parseLogs(e)).map(({name:o,data:c})=>({signature:r,slot:a,blockTime:s||0,programId:this.programId,data:c,eventName:o}))}catch(n){return l.Logger.error("Anchor EventParser failed; falling back to generic parsing:",n),[]}}}exports.SolanaBlockchainEventEmitter=y;

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

@@ -1,10 +1,16 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import type { Idl } from '@coral-xyz/anchor';
 import { Mutex } from 'async-mutex';
-import { EventProcessorFunction } from '../../../types/events.types';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
-export declare abstract class SolanaBlockchainEventEmitter {
-    private readonly _chainId;
+interface SolanaEvent {
+    signature: string;
+    slot: number;
+    blockTime: number;
+    programId: PublicKey;
+    data: any;
+    eventName: string;
+}
+export type SolanaEventProcessorFunction = (events: SolanaEvent[]) => Promise<number> | number;
+export declare class SolanaBlockchainEventEmitter {
     readonly connection: Connection;
     readonly programId: PublicKey;
     private _latestSlot;
@@ -14,23 +20,22 @@ export declare abstract class SolanaBlockchainEventEmitter {
     private readonly maxPageSize?;
     private isReady;
     private isServer;
+    private intervalId?;
     private inProgress;
     private anchorParser?;
-    protected eventsFetchingMutex: Mutex;
-    constructor(chainId: number, connection: Connection, programId: PublicKey, initialSlot: number, isServer: boolean, eventsFetchingMutex: Mutex, maxPageSize?: number);
-    get chainId(): number;
+    private eventsFetchingMutex;
+    constructor(connection: Connection, programId: PublicKey, initialSlot: number, isServer: boolean, maxPageSize?: number, eventsFetchingMutex?: Mutex);
     get latestBlockNumber(): number;
     setIdl(idl: Idl): void;
     syncFromAtMost(slot: number): void;
     intervalClear(): void;
     init(): Promise<void>;
     private requireReady;
-    addEventProcessorFunction(eventProcessorFunction: EventProcessorFunction): void;
+    get chainId(): number;
+    addEventProcessorFunction(eventProcessorFunction: SolanaEventProcessorFunction): void;
     private getLastSlotForEventRequest;
     retrieveEvents(fromBlock: number, useForce?: boolean): Promise<boolean>;
     private getProgramEvents;
     private parseLogsForEvents;
-    protected processEvents(events: BlockchainEvent[]): Promise<void>;
-    protected abstract clear(): void;
-    protected abstract startUpdateListener(): Promise<void> | void;
 }
+export {};

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

@@ -1,10 +1,11 @@
-import { BorshCoder as d, EventParser as m } from "@coral-xyz/anchor";
-import { getSequence as v, resolveSync as p } from "../../../functions/utils/resolve-sync.utils.mjs";
+import { BorshCoder as v, EventParser as p } from "@coral-xyz/anchor";
+import { getSequence as f, resolveSync as S } from "../../../functions/utils/resolve-sync.utils.mjs";
+import { balanceFetchingMutex as P } from "../../../functions/utils/mutexes.utils.mjs";
 import { Logger as l } from "../../../error-handling/logger.mjs";
-import { BlockchainEvent as S } from "../../BlockchainEvent/BlockchainEvent.mjs";
-const g = 1e3;
-class _ {
-  _chainId;
+import { networkRegistry as y, chainIds as u } from "../../../constants/chains.constants.mjs";
+import { caseInsensitiveEqual as E } from "../../../functions/utils/caseInsensitive.utils.mjs";
+const d = 1e3;
+class A {
   connection;
   programId;
   _latestSlot;
@@ -14,42 +15,46 @@ class _ {
   maxPageSize;
   isReady = !1;
   isServer;
+  intervalId;
   inProgress;
   // to remove race conditions
   anchorParser;
   eventsFetchingMutex;
-  constructor(t, s, a, e, r, c, o) {
-    this._chainId = t, this.connection = s, this.programId = a, this._initialSlot = e, this.maxPageSize = o, this.isServer = r, this.inProgress = !1, this.eventsFetchingMutex = c;
-  }
-  get chainId() {
-    return this._chainId;
+  constructor(t, r, a, s, n, o = P) {
+    this.connection = t, this.programId = r, this._initialSlot = a, this.maxPageSize = n, this.isServer = s, this.inProgress = !1, this.eventsFetchingMutex = o;
   }
   get latestBlockNumber() {
     return this._latestSlot ?? this._initialSlot;
   }
   setIdl(t) {
     try {
-      const s = new d(t);
-      this.anchorParser = new m(this.programId, s);
-    } catch (s) {
-      l.error("Failed to initialize Anchor EventParser:", s), this.anchorParser = void 0;
+      const r = new v(t);
+      this.anchorParser = new p(this.programId, r);
+    } catch (r) {
+      l.error("Failed to initialize Anchor EventParser:", r), this.anchorParser = void 0;
     }
   }
   syncFromAtMost(t) {
     (this._latestSlot === void 0 || t < this._latestSlot) && (this._latestSlot = 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)
       throw new Error("Not ready");
   }
+  get chainId() {
+    const t = this.connection.rpcEndpoint;
+    return E(t, y[u.solanaMainnet].fetchRpcUrl) ? u.solanaMainnet : u.solanaLocalnet;
+  }
   addEventProcessorFunction(t) {
     if (this.isReady)
       throw new Error("Can't add event processor after event emitter initialized");
@@ -60,93 +65,90 @@ class _ {
     return this.isServer ? Math.max(this.latestBlockNumber, t - 32 + 1) : t;
   }
   // Implementation for IBlockchainEventEmitter interface (blockNumber terminology)
-  async retrieveEvents(t, s = !1) {
+  async retrieveEvents(t, r = !1) {
     const a = t;
     return this.requireReady(), await this.eventsFetchingMutex.runExclusive(async () => {
       try {
-        if (this.inProgress && !s)
+        if (this.inProgress && !r)
           return !1;
         this.inProgress = !0;
-        const r = await this.getLastSlotForEventRequest();
-        if (r < a)
+        let n = 0;
+        const o = await this.getLastSlotForEventRequest();
+        if (o < a)
           return this.inProgress = !1, !1;
-        const c = v(a, r, this.maxPageSize), o = [];
-        await p(
-          c.map(({ from: i, to: n }) => async () => {
-            const u = await this.getProgramEvents(i, n);
-            o.push(...u);
+        const c = f(a, o, this.maxPageSize), h = [];
+        await S(
+          c.map(({ from: e, to: g }) => async () => {
+            const m = await this.getProgramEvents(e, g);
+            h.push(...m);
           })
         );
-        const h = o.map((i) => S.fromSolanaEvent(i));
-        return await this.processEvents(h), this._latestSlot = r, this.inProgress = !1, !0;
-      } catch (r) {
-        return l.error("retrieveEvents error:", r), this.inProgress = !1, !1;
+        const i = await Promise.all(
+          [...this.eventProcessors].map((e) => e(h))
+        );
+        return this._latestSlot = o, n += i.reduce((e, g) => e + g, 0), this.onEventsProcessed?.(n), this.inProgress = !1, !0;
+      } catch (n) {
+        return l.error("retrieveEvents error:", n), this.inProgress = !1, !1;
       }
     });
   }
-  async getProgramEvents(t, s) {
+  async getProgramEvents(t, r) {
     const a = [];
     try {
-      const e = await this.connection.getSignaturesForAddress(this.programId, {
-        limit: g,
+      const s = await this.connection.getSignaturesForAddress(this.programId, {
+        limit: d,
         before: void 0
         // Start from the latest
       });
-      let r = e.length;
-      for (; r >= g; ) {
-        const i = e[e.length - 1], n = await this.connection.getSignaturesForAddress(this.programId, {
-          limit: g,
+      let n = s.length;
+      for (; n >= d; ) {
+        const i = s[s.length - 1], e = await this.connection.getSignaturesForAddress(this.programId, {
+          limit: d,
           before: i.signature
         });
-        if (n.length === 0)
+        if (e.length === 0)
           break;
-        e.push(...n), r = n.length;
+        s.push(...e), n = e.length;
       }
-      const o = e.filter((i) => i.slot >= t && i.slot <= s).map(async (i) => {
+      const c = s.filter((i) => i.slot >= t && i.slot <= r).map(async (i) => {
         try {
-          const n = await this.connection.getTransaction(i.signature, {
+          const e = await this.connection.getTransaction(i.signature, {
             commitment: "confirmed",
             maxSupportedTransactionVersion: 0
           });
-          return n && n.meta && n.meta.logMessages ? this.parseLogsForEvents(
-            n.meta.logMessages,
+          return e && e.meta && e.meta.logMessages ? this.parseLogsForEvents(
+            e.meta.logMessages,
             i.signature,
             i.slot,
-            n.blockTime || null
+            e.blockTime || null
           ) : [];
-        } catch (n) {
-          return l.error(`Failed to get transaction ${i.signature}:`, n), [];
+        } catch (e) {
+          return l.error(`Failed to get transaction ${i.signature}:`, e), [];
         }
-      }), h = await Promise.all(o);
+      }), h = await Promise.all(c);
       a.push(...h.flat());
-    } catch (e) {
-      l.error("Error getting program events:", e);
+    } catch (s) {
+      l.error("Error getting program events:", s);
     }
     return a;
   }
-  parseLogsForEvents(t, s, a, e) {
+  parseLogsForEvents(t, r, a, s) {
     if (!this.anchorParser)
       return [];
     try {
-      return Array.from(this.anchorParser.parseLogs(t)).map(({ name: c, data: o }) => ({
-        signature: s,
+      return Array.from(this.anchorParser.parseLogs(t)).map(({ name: o, data: c }) => ({
+        signature: r,
         slot: a,
-        blockTime: e || 0,
+        blockTime: s || 0,
         programId: this.programId,
-        data: o,
-        eventName: c
+        data: c,
+        eventName: o
       }));
-    } catch (r) {
-      return l.error("Anchor EventParser failed; falling back to generic parsing:", r), [];
+    } catch (n) {
+      return l.error("Anchor EventParser failed; falling back to generic parsing:", n), [];
     }
   }
-  async processEvents(t) {
-    const a = (await Promise.all(
-      [...this.eventProcessors].map((e) => e(t))
-    )).reduce((e, r) => e + r, 0);
-    this.onEventsProcessed?.(a);
-  }
 }
 export {
-  _ as SolanaBlockchainEventEmitter
+  A as SolanaBlockchainEventEmitter
 };

package/data-structures/index.d.ts

@@ -16,6 +16,3 @@ export * from './presale';
 export * from './snapshot';
 export * from './http';
 export * from './ApprovalDBs';
-export * from './PublicBalance';
-export * from './BlockchainEvent/BlockchainEvent';
-export * from './AccountActions';

package/data-structures/presale/PresaleContractWrapper.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../constants/presale.constants.cjs"),s=require("ethers");class o{contract;eventsFrom;constructor(t,e){const{address:r,eventsFrom:a}=n.presaleContractInfoByChain[e];this.contract=new s.ethers.Contract(r,n.presaleABI,t),this.eventsFrom=a}deposit(t,e,r){return this.contract.deposit(t.erc20TokenAddress,e,r)}withdraw(t,e){return this.contract.withdraw(t,e)}moveToNextStage(t){return this.contract.moveToNextStage(t||{})}async estimateMoveToNextStageGas(){return(await this.contract.estimateGas.moveToNextStage()).toBigInt()}async getTotalDeposit(){return(await this.contract.totalDeposit()).toBigInt()}async getDeposits(t,e){return(await this.contract.deposits(t,e.erc20TokenAddress)).toBigInt()}async getTotalHINK(t){return(await this.contract.totalHINK(t)).toBigInt()}async getCurrentPresaleStageIndex(){const t=await this.contract.currentPresaleStageIndex();return Number(t)}async getCurrentMaxDepositAmount(){return(await this.contract.currentMaxDepositAmount()).toBigInt()}async currentPresaleStage(){const[t,e]=await this.contract.currentPresaleStage(),[r,a]=[t,e].map(BigInt);return{amountToRaise:r,priceMultiplier:a}}async calculateHINK(t){return(await this.contract.calculateHINK(t)).toBigInt()}async queryDeposits(){return this.contract.queryFilter(this.contract.filters.Deposit(),this.eventsFrom)}onEvent(t,e){this.contract.on(t,e)}}exports.PresaleContractWrapper=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../constants/presale.constants.cjs"),n=require("ethers");class o{contract;eventsFrom;constructor(t,e){const{address:r,eventsFrom:a}=s.presaleContractInfoByChain[e];this.contract=new n.ethers.Contract(r,s.presaleABI,t),this.eventsFrom=a}deposit(t,e,r){return this.contract.deposit(t.erc20TokenAddress,e,r)}withdraw(t,e){return this.contract.withdraw(t,e)}moveToNextStage(t){return this.contract.moveToNextStage(t||{})}async estimateMoveToNextStageGas(){return this.contract.moveToNextStage.estimateGas()}async getTotalDeposit(){return await this.contract.totalDeposit()}async getDeposits(t,e){return await this.contract.deposits(t,e.erc20TokenAddress)}async getTotalHINK(t){return await this.contract.totalHINK(t)}async getCurrentPresaleStageIndex(){const t=await this.contract.currentPresaleStageIndex();return Number(t)}async getCurrentMaxDepositAmount(){return await this.contract.currentMaxDepositAmount()}async currentPresaleStage(){const[t,e]=await this.contract.currentPresaleStage(),[r,a]=[t,e].map(BigInt);return{amountToRaise:r,priceMultiplier:a}}async calculateHINK(t){return await this.contract.calculateHINK(t)}async queryDeposits(){return this.contract.queryFilter(this.contract.filters.Deposit(),this.eventsFrom)}onEvent(t,e){this.contract.on(t,e)}}exports.PresaleContractWrapper=o;

package/data-structures/presale/PresaleContractWrapper.d.ts

@@ -3,7 +3,7 @@ import { ethers } from 'ethers';
 export declare class PresaleContractWrapper {
     contract: ethers.Contract;
     eventsFrom: number;
-    constructor(signerOrProvider: ethers.Signer | ethers.providers.Provider, chainId: number);
+    constructor(signerOrProvider: ethers.Signer | ethers.Provider, chainId: number);
     deposit(token: ERC20Token, amount: bigint, minHINK: bigint): Promise<ethers.ContractTransaction>;
     withdraw(token: string, amount: bigint): Promise<ethers.ContractTransaction>;
     moveToNextStage(overrides?: ethers.Overrides): Promise<ethers.ContractTransaction>;
@@ -18,6 +18,6 @@ export declare class PresaleContractWrapper {
         priceMultiplier: bigint;
     }>;
     calculateHINK(amount: bigint): Promise<bigint>;
-    queryDeposits(): Promise<ethers.Event[]>;
-    onEvent(eventName: string, handleEvent: ethers.providers.Listener): void;
+    queryDeposits(): Promise<(ethers.Log | ethers.EventLog)[]>;
+    onEvent(eventName: string, handleEvent: ethers.Listener): void;
 }

package/data-structures/presale/PresaleContractWrapper.mjs

@@ -1,11 +1,11 @@
-import { presaleContractInfoByChain as n, presaleABI as o } from "../../constants/presale.constants.mjs";
-import { ethers as s } from "ethers";
+import { presaleContractInfoByChain as s, presaleABI as n } from "../../constants/presale.constants.mjs";
+import { ethers as o } from "ethers";
 class l {
   contract;
   eventsFrom;
   constructor(t, e) {
-    const { address: r, eventsFrom: a } = n[e];
-    this.contract = new s.Contract(r, o, t), this.eventsFrom = a;
+    const { address: r, eventsFrom: a } = s[e];
+    this.contract = new o.Contract(r, n, t), this.eventsFrom = a;
   }
   deposit(t, e, r) {
     return this.contract.deposit(t.erc20TokenAddress, e, r);
@@ -17,30 +17,30 @@ class l {
     return this.contract.moveToNextStage(t || {});
   }
   async estimateMoveToNextStageGas() {
-    return (await this.contract.estimateGas.moveToNextStage()).toBigInt();
+    return this.contract.moveToNextStage.estimateGas();
   }
   async getTotalDeposit() {
-    return (await this.contract.totalDeposit()).toBigInt();
+    return await this.contract.totalDeposit();
   }
   async getDeposits(t, e) {
-    return (await this.contract.deposits(t, e.erc20TokenAddress)).toBigInt();
+    return await this.contract.deposits(t, e.erc20TokenAddress);
   }
   async getTotalHINK(t) {
-    return (await this.contract.totalHINK(t)).toBigInt();
+    return await this.contract.totalHINK(t);
   }
   async getCurrentPresaleStageIndex() {
     const t = await this.contract.currentPresaleStageIndex();
     return Number(t);
   }
   async getCurrentMaxDepositAmount() {
-    return (await this.contract.currentMaxDepositAmount()).toBigInt();
+    return await this.contract.currentMaxDepositAmount();
   }
   async currentPresaleStage() {
     const [t, e] = await this.contract.currentPresaleStage(), [r, a] = [t, e].map(BigInt);
     return { amountToRaise: r, priceMultiplier: a };
   }
   async calculateHINK(t) {
-    return (await this.contract.calculateHINK(t)).toBigInt();
+    return await this.contract.calculateHINK(t);
   }
   async queryDeposits() {
     return this.contract.queryFilter(this.contract.filters.Deposit(), this.eventsFrom);