@hinkal/common 0.2.27 → 0.2.28

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

@@ -0,0 +1,11 @@
+import { Connection, PublicKey } from '@solana/web3.js';
+import type { Idl } from '@coral-xyz/anchor';
+import { SolanaBlockchainEventEmitter } from './SolanaBlockchainEventEmitter';
+import { Mutex } from 'async-mutex';
+import { ClientEventHelper } from '../helpers/ClientEventHelper';
+export declare class ClientSolanaBlockchainEventEmitter extends SolanaBlockchainEventEmitter {
+    clientEventHelper: ClientEventHelper;
+    constructor(chainId: number, connection: Connection, programId: PublicKey, initialSlot: number, eventsFetchingMutex: Mutex, maxPageSize?: number, idl?: Idl);
+    protected clear(): void;
+    protected startUpdateListener(): void;
+}

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

@@ -0,0 +1,26 @@
+import { EventCategory as l } from "../../../types/events.types.mjs";
+import { SolanaBlockchainEventEmitter as c } from "./SolanaBlockchainEventEmitter.mjs";
+import { ClientEventHelper as o } from "../helpers/ClientEventHelper.mjs";
+class m extends c {
+  clientEventHelper;
+  constructor(t, n, r, s, i, a, e) {
+    super(t, n, r, s, !1, i, a), e && this.setIdl(e), this.clientEventHelper = new o(t, l.MainContractEvents);
+  }
+  clear() {
+    this.clientEventHelper.clear();
+  }
+  startUpdateListener() {
+    this.clientEventHelper.startUpdateListener(
+      async (t) => {
+        await this.eventsFetchingMutex.runExclusive(async () => {
+          await this.processEvents(t);
+        });
+      },
+      this.latestBlockNumber + 1,
+      (t) => this.advanceLatestBlockNumber(t)
+    );
+  }
+}
+export {
+  m as ClientSolanaBlockchainEventEmitter
+};

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

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

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

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

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

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

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

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("@coral-xyz/anchor"),v=require("../../../functions/utils/resolve-sync.utils.cjs"),g=require("../../../error-handling/logger.cjs"),m=require("../../BlockchainEvent/BlockchainEvent.cjs"),p=1e3,f=20;class E{_chainId;connection;programId;_latestSlot;_initialSlot;onEventsProcessed;eventProcessors=new Set;maxPageSize;_isReady=!1;isServer;inProgress;anchorParser;anchorCoder;eventsFetchingMutex;constructor(e,r,i,s,a,t,n){this._chainId=e,this.connection=r,this.programId=i,this._initialSlot=s,this.maxPageSize=n,this.isServer=a,this.inProgress=!1,this.eventsFetchingMutex=t}get chainId(){return this._chainId}get latestBlockNumber(){return this._latestSlot??this._initialSlot}get isReady(){return this._isReady}setIdl(e){try{const r=new d.BorshCoder(e);this.anchorCoder=r,this.anchorParser=new d.EventParser(this.programId,r)}catch(r){g.Logger.error("Failed to initialize Anchor EventParser:",r),this.anchorParser=void 0,this.anchorCoder=void 0}}syncFromAtMost(e){(this._latestSlot===void 0||e<this._latestSlot)&&(this._latestSlot=e)}advanceLatestBlockNumber(e){const r=this._latestSlot??this._initialSlot;e>r&&(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,!1,!0),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 getEventsInRange(e,r){return(await this.getProgramEvents(e,r)).map(s=>m.BlockchainEvent.fromSolanaEvent(s))}async getLastBlockNumberForEventRequest(){const e=await this.connection.getSlot();return this.isServer?Math.max(this.latestBlockNumber,e-32+1):e}async retrieveEvents(e,r=!1,i=!1){const s=e;return this.requireReady(),await this.eventsFetchingMutex.runExclusive(async()=>{try{if(this.inProgress&&!r)return!1;this.inProgress=!0;const t=await this.getLastBlockNumberForEventRequest();if(t<s)return this.inProgress=!1,!1;const n=v.getSequence(s,t,this.maxPageSize),h=[];await v.resolveSync(n.map(({from:c,to:l})=>async()=>{const o=await this.getProgramEvents(c,l,i);h.push(...o)}));const u=h.map(c=>m.BlockchainEvent.fromSolanaEvent(c));return await this.processEvents(u),this._latestSlot=t,this.inProgress=!1,!0}catch(t){return g.Logger.error("retrieveEvents error:",t),this.inProgress=!1,!1}})}async getProgramEvents(e,r,i=!1){const s=[],a=i?p:f;try{const t=await this.connection.getSignaturesForAddress(this.programId,{limit:a,before:void 0});let n=t.length;for(;n>=a&&t[t.length-1].slot>=e;){const l=t[t.length-1],o=await this.connection.getSignaturesForAddress(this.programId,{limit:a,before:l.signature});if(o.length===0)break;t.push(...o),n=o.length}const u=t.filter(l=>l.slot>=e&&l.slot<=r).map(async l=>{try{const o=await this.connection.getTransaction(l.signature,{commitment:"confirmed",maxSupportedTransactionVersion:0});return o&&o.meta&&!o.meta.err?this.parseTransactionForEvents(o,l.signature,l.slot,o.blockTime||null):[]}catch(o){return g.Logger.error(`Failed to get transaction ${l.signature}:`,o),[]}}),c=await Promise.all(u);s.push(...c.flat())}catch(t){g.Logger.error("Error getting program events:",t)}return s}parseTransactionForEvents(e,r,i,s){const a=this.parseLogsForEvents(e?.meta?.logMessages??[],r,i,s),t=this.parseCpiForEvents(e,r,i,s),n=[...a,...t];if(n.length===0)return[];const h=new Set;return n.filter(u=>{const c=`${u.signature}:${u.eventName}:${JSON.stringify(u.data)}`;return h.has(c)?!1:(h.add(c),!0)})}parseLogsForEvents(e,r,i,s){if(!this.anchorParser)return[];try{return Array.from(this.anchorParser.parseLogs(e)).map(({name:t,data:n})=>({signature:r,slot:i,blockTime:s||0,programId:this.programId,data:n,eventName:t}))}catch(a){return g.Logger.error("Anchor EventParser failed; falling back to generic parsing:",a),[]}}parseCpiForEvents(e,r,i,s){if(!e||!this.anchorCoder)return[];const a=e.meta?.innerInstructions??[];if(a.length===0)return[];try{return a.flatMap(n=>n.instructions??[]).map(n=>{try{if(!n?.data)return null;const h=d.utils.bytes.bs58.decode(n.data);if(h.length<=8)return null;const u=d.utils.bytes.base64.encode(h.subarray(8)),c=this.anchorCoder?.events.decode(u);return c?{signature:r,slot:i,blockTime:s||0,programId:this.programId,data:c.data,eventName:c.name}:null}catch{return null}}).filter(n=>n!==null)}catch(t){return g.Logger.error("Failed to parse emit_cpi events:",t),[]}}async processEvents(e){const i=(await Promise.all([...this.eventProcessors].map(s=>s(e)))).reduce((s,a)=>s+a,0);this.onEventsProcessed?.(i)}}exports.SolanaBlockchainEventEmitter=E;

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

@@ -1,16 +1,10 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import type { Idl } from '@coral-xyz/anchor';
 import { Mutex } from 'async-mutex';
-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 {
+import { EventProcessorFunction } from '../../../types/events.types';
+import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
+export declare abstract class SolanaBlockchainEventEmitter {
+    private readonly _chainId;
     readonly connection: Connection;
     readonly programId: PublicKey;
     private _latestSlot;
@@ -18,24 +12,31 @@ export declare class SolanaBlockchainEventEmitter {
     onEventsProcessed?: (acceptedEventCount: number) => void;
     private eventProcessors;
     private readonly maxPageSize?;
-    private isReady;
+    private _isReady;
     private isServer;
-    private intervalId?;
     private inProgress;
     private anchorParser?;
-    private eventsFetchingMutex;
-    constructor(connection: Connection, programId: PublicKey, initialSlot: number, isServer: boolean, maxPageSize?: number, eventsFetchingMutex?: Mutex);
+    private anchorCoder?;
+    protected eventsFetchingMutex: Mutex;
+    constructor(chainId: number, connection: Connection, programId: PublicKey, initialSlot: number, isServer: boolean, eventsFetchingMutex: Mutex, maxPageSize?: number);
+    get chainId(): number;
     get latestBlockNumber(): number;
+    get isReady(): boolean;
     setIdl(idl: Idl): void;
     syncFromAtMost(slot: number): void;
+    protected advanceLatestBlockNumber(slot: number): void;
     intervalClear(): void;
     init(): Promise<void>;
     private requireReady;
-    get chainId(): number;
-    addEventProcessorFunction(eventProcessorFunction: SolanaEventProcessorFunction): void;
-    private getLastSlotForEventRequest;
-    retrieveEvents(fromBlock: number, useForce?: boolean): Promise<boolean>;
+    addEventProcessorFunction(eventProcessorFunction: EventProcessorFunction): void;
+    getEventsInRange(fromSlot: number, toSlot: number): Promise<BlockchainEvent[]>;
+    getLastBlockNumberForEventRequest(): Promise<number>;
+    retrieveEvents(fromBlock: number, useForce?: boolean, initialLoading?: boolean): Promise<boolean>;
     private getProgramEvents;
+    private parseTransactionForEvents;
     private parseLogsForEvents;
+    private parseCpiForEvents;
+    protected processEvents(events: BlockchainEvent[]): Promise<void>;
+    protected abstract clear(): void;
+    protected abstract startUpdateListener(): void;
 }
-export {};

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

@@ -1,11 +1,10 @@
-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 { 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 {
+import { BorshCoder as m, EventParser as p, utils as g } from "@coral-xyz/anchor";
+import { getSequence as f, resolveSync as E } from "../../../functions/utils/resolve-sync.utils.mjs";
+import { Logger as d } from "../../../error-handling/logger.mjs";
+import { BlockchainEvent as v } from "../../BlockchainEvent/BlockchainEvent.mjs";
+const S = 1e3, y = 20;
+class F {
+  _chainId;
   connection;
   programId;
   _latestSlot;
@@ -13,142 +12,193 @@ class A {
   onEventsProcessed;
   eventProcessors = /* @__PURE__ */ new Set();
   maxPageSize;
-  isReady = !1;
+  _isReady = !1;
   isServer;
-  intervalId;
   inProgress;
   // to remove race conditions
   anchorParser;
+  anchorCoder;
   eventsFetchingMutex;
-  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;
+  constructor(t, r, i, s, a, e, n) {
+    this._chainId = t, this.connection = r, this.programId = i, this._initialSlot = s, this.maxPageSize = n, this.isServer = a, this.inProgress = !1, this.eventsFetchingMutex = e;
+  }
+  get chainId() {
+    return this._chainId;
   }
   get latestBlockNumber() {
     return this._latestSlot ?? this._initialSlot;
   }
+  get isReady() {
+    return this._isReady;
+  }
   setIdl(t) {
     try {
-      const r = new v(t);
-      this.anchorParser = new p(this.programId, r);
+      const r = new m(t);
+      this.anchorCoder = r, this.anchorParser = new p(this.programId, r);
     } catch (r) {
-      l.error("Failed to initialize Anchor EventParser:", r), this.anchorParser = void 0;
+      d.error("Failed to initialize Anchor EventParser:", r), this.anchorParser = void 0, this.anchorCoder = void 0;
     }
   }
   syncFromAtMost(t) {
     (this._latestSlot === void 0 || t < this._latestSlot) && (this._latestSlot = t);
   }
+  advanceLatestBlockNumber(t) {
+    const r = this._latestSlot ?? this._initialSlot;
+    t > r && (this._latestSlot = 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)
+    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, !1, !0), this.startUpdateListener();
   }
   requireReady() {
-    if (!this.isReady)
+    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)
+    if (this._isReady)
       throw new Error("Can't add event processor after event emitter initialized");
     this.eventProcessors.add(t);
   }
-  async getLastSlotForEventRequest() {
+  async getEventsInRange(t, r) {
+    return (await this.getProgramEvents(t, r)).map((s) => v.fromSolanaEvent(s));
+  }
+  async getLastBlockNumberForEventRequest() {
     const t = await this.connection.getSlot();
     return this.isServer ? Math.max(this.latestBlockNumber, t - 32 + 1) : t;
   }
   // Implementation for IBlockchainEventEmitter interface (blockNumber terminology)
-  async retrieveEvents(t, r = !1) {
-    const a = t;
+  async retrieveEvents(t, r = !1, i = !1) {
+    const s = t;
     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)
+        const e = await this.getLastBlockNumberForEventRequest();
+        if (e < s)
           return this.inProgress = !1, !1;
-        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 n = f(s, e, this.maxPageSize), h = [];
+        await E(
+          n.map(({ from: c, to: l }) => async () => {
+            const o = await this.getProgramEvents(c, l, i);
+            h.push(...o);
           })
         );
-        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;
+        const u = h.map((c) => v.fromSolanaEvent(c));
+        return await this.processEvents(u), this._latestSlot = e, this.inProgress = !1, !0;
+      } catch (e) {
+        return d.error("retrieveEvents error:", e), this.inProgress = !1, !1;
       }
     });
   }
-  async getProgramEvents(t, r) {
-    const a = [];
+  async getProgramEvents(t, r, i = !1) {
+    const s = [], a = i ? S : y;
     try {
-      const s = await this.connection.getSignaturesForAddress(this.programId, {
-        limit: d,
+      const e = await this.connection.getSignaturesForAddress(this.programId, {
+        limit: a,
         before: void 0
         // Start from the latest
       });
-      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
+      let n = e.length;
+      for (; n >= a && e[e.length - 1].slot >= t; ) {
+        const l = e[e.length - 1], o = await this.connection.getSignaturesForAddress(this.programId, {
+          limit: a,
+          before: l.signature
         });
-        if (e.length === 0)
+        if (o.length === 0)
           break;
-        s.push(...e), n = e.length;
+        e.push(...o), n = o.length;
       }
-      const c = s.filter((i) => i.slot >= t && i.slot <= r).map(async (i) => {
+      const u = e.filter((l) => l.slot >= t && l.slot <= r).map(async (l) => {
         try {
-          const e = await this.connection.getTransaction(i.signature, {
+          const o = await this.connection.getTransaction(l.signature, {
             commitment: "confirmed",
             maxSupportedTransactionVersion: 0
           });
-          return e && e.meta && e.meta.logMessages ? this.parseLogsForEvents(
-            e.meta.logMessages,
-            i.signature,
-            i.slot,
-            e.blockTime || null
+          return o && o.meta && !o.meta.err ? this.parseTransactionForEvents(
+            o,
+            l.signature,
+            l.slot,
+            o.blockTime || null
           ) : [];
-        } catch (e) {
-          return l.error(`Failed to get transaction ${i.signature}:`, e), [];
+        } catch (o) {
+          return d.error(`Failed to get transaction ${l.signature}:`, o), [];
         }
-      }), h = await Promise.all(c);
-      a.push(...h.flat());
-    } catch (s) {
-      l.error("Error getting program events:", s);
+      }), c = await Promise.all(u);
+      s.push(...c.flat());
+    } catch (e) {
+      d.error("Error getting program events:", e);
     }
-    return a;
+    return s;
   }
-  parseLogsForEvents(t, r, a, s) {
+  parseTransactionForEvents(t, r, i, s) {
+    const a = this.parseLogsForEvents(t?.meta?.logMessages ?? [], r, i, s), e = this.parseCpiForEvents(t, r, i, s), n = [...a, ...e];
+    if (n.length === 0)
+      return [];
+    const h = /* @__PURE__ */ new Set();
+    return n.filter((u) => {
+      const c = `${u.signature}:${u.eventName}:${JSON.stringify(u.data)}`;
+      return h.has(c) ? !1 : (h.add(c), !0);
+    });
+  }
+  parseLogsForEvents(t, r, i, s) {
     if (!this.anchorParser)
       return [];
     try {
-      return Array.from(this.anchorParser.parseLogs(t)).map(({ name: o, data: c }) => ({
+      return Array.from(this.anchorParser.parseLogs(t)).map(({ name: e, data: n }) => ({
         signature: r,
-        slot: a,
+        slot: i,
         blockTime: s || 0,
         programId: this.programId,
-        data: c,
-        eventName: o
+        data: n,
+        eventName: e
       }));
-    } catch (n) {
-      return l.error("Anchor EventParser failed; falling back to generic parsing:", n), [];
+    } catch (a) {
+      return d.error("Anchor EventParser failed; falling back to generic parsing:", a), [];
     }
   }
+  parseCpiForEvents(t, r, i, s) {
+    if (!t || !this.anchorCoder)
+      return [];
+    const a = t.meta?.innerInstructions ?? [];
+    if (a.length === 0)
+      return [];
+    try {
+      return a.flatMap((n) => n.instructions ?? []).map((n) => {
+        try {
+          if (!n?.data)
+            return null;
+          const h = g.bytes.bs58.decode(n.data);
+          if (h.length <= 8)
+            return null;
+          const u = g.bytes.base64.encode(h.subarray(8)), c = this.anchorCoder?.events.decode(u);
+          return c ? {
+            signature: r,
+            slot: i,
+            blockTime: s || 0,
+            programId: this.programId,
+            data: c.data,
+            eventName: c.name
+          } : null;
+        } catch {
+          return null;
+        }
+      }).filter((n) => n !== null);
+    } catch (e) {
+      return d.error("Failed to parse emit_cpi events:", e), [];
+    }
+  }
+  async processEvents(t) {
+    const i = (await Promise.all(
+      [...this.eventProcessors].map((s) => s(t))
+    )).reduce((s, a) => s + a, 0);
+    this.onEventsProcessed?.(i);
+  }
 }
 export {
-  A as SolanaBlockchainEventEmitter
+  F as SolanaBlockchainEventEmitter
 };

package/data-structures/index.d.ts

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

package/data-structures/merkle-tree/MerkleTree.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../constants/protocol.constants.cjs"),c=require("../../error-handling/logError.cjs"),u=require("./MerkleTreeIncompleteError.cjs");class l{constructor(t,e,r,n,s,i,h){this.hashFunction=t,this.levels=e,this.defaultNodeValue=r,this.tree=n??new Map,this.count=h??0n,this.index=i??2n**(e-1n),s?this.reverseTree=s:this.reverseTree=this.createReverseTree()}tree;count;index;reverseTree;static createWithData(t,e,r,n,s,i,h){return new l(s,i,h,t,e,r,n)}static create(t,e,r=o.MERKLE_LEVELS){return new l(t,r,e)}createReverseTree(){const t=new Map;for(let e=this.getStartIndex();e<this.getStartIndex()+this.count;e+=1n){const r=this.tree.get(e);r!==void 0&&t.set(r,e)}return t}getStartIndex(){return 2n**(this.levels-1n)}logarithm2(t){let e=0n;for(;2n**e<t;)e+=1n;return e}bigIntMax(t,e){return t>e?t:e}forceInsert(t,e){if(e<this.getStartIndex())throw new RangeError;this.tree.set(e,t),this.reverseTree.set(t,e);const r=this.index-this.getStartIndex(),n=this.logarithm2(r);let s=e;for(let i=1n;i<=n;i+=1n){s/=2n;const h=this.hashFunction(this.tree.get(s*2n)||this.defaultNodeValue,this.tree.get(s*2n+1n)||this.defaultNodeValue);this.tree.set(s,h)}}insert(t,e){let r=!1;return this.tree.has(e)&&(r=!0,c.logError(`Editing commitment index: ${e} `)),r||(this.count+=1n),this.index=this.bigIntMax(this.index,e+1n),this.forceInsert(t,e),!0}remove(t){this.forceInsert(this.defaultNodeValue,t)}completenessCheck(){if(this.count!==this.index-this.getStartIndex())throw new u.MerkleTreeIncompleteError}getRootHash(){this.completenessCheck();for(let t=1n;t<2n**this.levels;t*=2n)if(this.tree.get(t))return this.tree.get(t);return this.defaultNodeValue}getMerkleData(){return this.completenessCheck(),new Map(this.tree)}getSiblingIndex(t){return t===1n?1n:t%2n===1n?t-1n:t+1n}getSiblingHashesForVerification(t){this.completenessCheck();let e=this.reverseTree.get(t);if(e===void 0)return new Array(Number(o.CIRCOM_MERKLE_LENGTH)).fill(0n);const r=[];for(;e!==0n;)r.push(this.tree.get(this.getSiblingIndex(e))||this.defaultNodeValue),e/=2n;return r.slice(0,o.CIRCOM_MERKLE_LENGTH)}getSiblingSides(t){this.completenessCheck();let e=this.reverseTree.get(t);if(e===void 0)return new Array(Number(o.CIRCOM_MERKLE_LENGTH)).fill(0n);const r=[];for(;e!==0n;){const n=e%2n===0n?0n:1n;r.push(n),e/=2n}return r.slice(0,o.CIRCOM_MERKLE_LENGTH)}toJSON(){const{tree:t,reverseTree:e,count:r,index:n}=this;return{tree:Object.fromEntries(t),reverseTree:Object.fromEntries(e),count:r.toString(),index:n.toString()}}clone(){return l.createWithData(new Map(this.tree),new Map(this.reverseTree),this.index,this.count,this.hashFunction,this.levels,this.defaultNodeValue)}getIndex(){return this.index}}exports.MerkleTree=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../constants/protocol.constants.cjs"),c=require("../../error-handling/logError.cjs"),u=require("./MerkleTreeIncompleteError.cjs");class l{constructor(t,e,r,n,i,s,h){this.hashFunction=t,this.levels=e,this.defaultNodeValue=r,this.tree=n??new Map,this.count=h??0n,this.index=s??2n**(e-1n),i?this.reverseTree=i:this.reverseTree=this.createReverseTree()}tree;count;index;reverseTree;static createWithData(t,e,r,n,i,s,h){return new l(i,s,h,t,e,r,n)}static create(t,e,r=o.MERKLE_LEVELS){return new l(t,r,e)}createReverseTree(){const t=new Map;for(let e=this.getStartIndex();e<this.getStartIndex()+this.count;e+=1n){const r=this.tree.get(e);r!==void 0&&t.set(r,e)}return t}getStartIndex(){return 2n**(this.levels-1n)}logarithm2(t){let e=0n;for(;2n**e<t;)e+=1n;return e}bigIntMax(t,e){return t>e?t:e}forceInsert(t,e){if(e<this.getStartIndex())throw new RangeError;this.tree.set(e,t),this.reverseTree.set(t,e);const r=this.index-this.getStartIndex(),n=this.logarithm2(r);let i=e;for(let s=1n;s<=n;s+=1n){i/=2n;const h=this.hashFunction(this.tree.get(i*2n)||this.defaultNodeValue,this.tree.get(i*2n+1n)||this.defaultNodeValue);this.tree.set(i,h)}}insert(t,e){let r=!1;this.tree.has(e)&&(r=!0,c.logError(`Editing commitment index: ${e} `)),r||(this.count+=1n),this.index=this.bigIntMax(this.index,e+1n),this.forceInsert(t,e)}remove(t){this.forceInsert(this.defaultNodeValue,t)}completenessCheck(){if(this.count!==this.index-this.getStartIndex())throw new u.MerkleTreeIncompleteError}getRootHash(){this.completenessCheck();for(let t=1n;t<2n**this.levels;t*=2n)if(this.tree.get(t))return this.tree.get(t);return this.defaultNodeValue}getMerkleData(){return this.completenessCheck(),new Map(this.tree)}getValue(t){return this.tree.get(t)}getSiblingIndex(t){return t===1n?1n:t%2n===1n?t-1n:t+1n}getSiblingHashesForVerification(t){this.completenessCheck();let e=this.reverseTree.get(t);if(e===void 0)return new Array(Number(o.CIRCOM_MERKLE_LENGTH)).fill(0n);const r=[];for(;e!==0n;)r.push(this.tree.get(this.getSiblingIndex(e))||this.defaultNodeValue),e/=2n;return r.slice(0,o.CIRCOM_MERKLE_LENGTH)}getSiblingSides(t){this.completenessCheck();let e=this.reverseTree.get(t);if(e===void 0)return new Array(Number(o.CIRCOM_MERKLE_LENGTH)).fill(0n);const r=[];for(;e!==0n;){const n=e%2n===0n?0n:1n;r.push(n),e/=2n}return r.slice(0,o.CIRCOM_MERKLE_LENGTH)}toJSON(){const{tree:t,reverseTree:e,count:r,index:n}=this;return{tree:Object.fromEntries(t),reverseTree:Object.fromEntries(e),count:r.toString(),index:n.toString()}}toJSONLite(){const{tree:t,count:e,index:r}=this;return{tree:Object.fromEntries(t),count:e.toString(),index:r.toString()}}clone(){return l.createWithData(new Map(this.tree),new Map(this.reverseTree),this.index,this.count,this.hashFunction,this.levels,this.defaultNodeValue)}getIndex(){return this.index}}exports.MerkleTree=l;

package/data-structures/merkle-tree/MerkleTree.d.ts

@@ -50,10 +50,9 @@ export declare class MerkleTree<T> {
      * insert value into the merkle tree
      * @param value the value to insert
      * @param nodeIndex the index to insert the value, you can get starting index from getStartIndex()
-     * @return true - if added, false - if already exists
      * @throws will throw RangeError if nodeIndex is less than getStartIndex()
      */
-    insert(value: T, nodeIndex: bigint): boolean;
+    insert(value: T, nodeIndex: bigint): void;
     remove(nodeIndex: bigint): void;
     private completenessCheck;
     /**
@@ -63,6 +62,7 @@ export declare class MerkleTree<T> {
      */
     getRootHash(): T | undefined;
     getMerkleData(): Map<bigint, T>;
+    getValue(index: bigint): T | undefined;
     getSiblingIndex(index: bigint): bigint;
     /**
      * get sibling hashes needed by main.circom
@@ -76,6 +76,7 @@ export declare class MerkleTree<T> {
      */
     getSiblingSides(item: T): bigint[];
     toJSON(): MerkleTreeJson;
+    toJSONLite(): MerkleTreeJson;
     clone(): MerkleTree<T>;
     getIndex(): bigint;
 }

package/data-structures/merkle-tree/MerkleTree.mjs

@@ -1,9 +1,9 @@
-import { MERKLE_LEVELS as a, CIRCOM_MERKLE_LENGTH as o } from "../../constants/protocol.constants.mjs";
-import { logError as u } from "../../error-handling/logError.mjs";
-import { MerkleTreeIncompleteError as c } from "./MerkleTreeIncompleteError.mjs";
+import { MERKLE_LEVELS as u, CIRCOM_MERKLE_LENGTH as o } from "../../constants/protocol.constants.mjs";
+import { logError as c } from "../../error-handling/logError.mjs";
+import { MerkleTreeIncompleteError as a } from "./MerkleTreeIncompleteError.mjs";
 class l {
-  constructor(t, e, r, i, s, n, h) {
-    this.hashFunction = t, this.levels = e, this.defaultNodeValue = r, this.tree = i ?? /* @__PURE__ */ new Map(), this.count = h ?? 0n, this.index = n ?? 2n ** (e - 1n), s ? this.reverseTree = s : this.reverseTree = this.createReverseTree();
+  constructor(t, e, r, i, n, s, h) {
+    this.hashFunction = t, this.levels = e, this.defaultNodeValue = r, this.tree = i ?? /* @__PURE__ */ new Map(), this.count = h ?? 0n, this.index = s ?? 2n ** (e - 1n), n ? this.reverseTree = n : this.reverseTree = this.createReverseTree();
   }
   /**
    * the map where the items are stored
@@ -20,15 +20,15 @@ class l {
    */
   index;
   reverseTree;
-  static createWithData(t, e, r, i, s, n, h) {
-    return new l(s, n, h, t, e, r, i);
+  static createWithData(t, e, r, i, n, s, h) {
+    return new l(n, s, h, t, e, r, i);
   }
   /**
    * @param hashFunction the hashFunction used to fill the upper layers of the merkle tree
    * @param levels the amount of layers in the merkle tree
    * @param defaultNodeValue the default value of an empty node in the merkle tree
    */
-  static create(t, e, r = a) {
+  static create(t, e, r = u) {
     return new l(t, r, e);
   }
   createReverseTree() {
@@ -62,33 +62,32 @@ class l {
       throw new RangeError();
     this.tree.set(e, t), this.reverseTree.set(t, e);
     const r = this.index - this.getStartIndex(), i = this.logarithm2(r);
-    let s = e;
-    for (let n = 1n; n <= i; n += 1n) {
-      s /= 2n;
+    let n = e;
+    for (let s = 1n; s <= i; s += 1n) {
+      n /= 2n;
       const h = this.hashFunction(
-        this.tree.get(s * 2n) || this.defaultNodeValue,
-        this.tree.get(s * 2n + 1n) || this.defaultNodeValue
+        this.tree.get(n * 2n) || this.defaultNodeValue,
+        this.tree.get(n * 2n + 1n) || this.defaultNodeValue
       );
-      this.tree.set(s, h);
+      this.tree.set(n, h);
     }
   }
   /**
    * insert value into the merkle tree
    * @param value the value to insert
    * @param nodeIndex the index to insert the value, you can get starting index from getStartIndex()
-   * @return true - if added, false - if already exists
    * @throws will throw RangeError if nodeIndex is less than getStartIndex()
    */
   insert(t, e) {
     let r = !1;
-    return this.tree.has(e) && (r = !0, u(`Editing commitment index: ${e} `)), r || (this.count += 1n), this.index = this.bigIntMax(this.index, e + 1n), this.forceInsert(t, e), !0;
+    this.tree.has(e) && (r = !0, c(`Editing commitment index: ${e} `)), r || (this.count += 1n), this.index = this.bigIntMax(this.index, e + 1n), this.forceInsert(t, e);
   }
   remove(t) {
     this.forceInsert(this.defaultNodeValue, t);
   }
   completenessCheck() {
     if (this.count !== this.index - this.getStartIndex())
-      throw new c();
+      throw new a();
   }
   /**
    * get root hash of the merkle tree
@@ -105,6 +104,9 @@ class l {
   getMerkleData() {
     return this.completenessCheck(), new Map(this.tree);
   }
+  getValue(t) {
+    return this.tree.get(t);
+  }
   getSiblingIndex(t) {
     return t === 1n ? 1n : t % 2n === 1n ? t - 1n : t + 1n;
   }
@@ -148,6 +150,14 @@ class l {
       index: i.toString()
     };
   }
+  toJSONLite() {
+    const { tree: t, count: e, index: r } = this;
+    return {
+      tree: Object.fromEntries(t),
+      count: e.toString(),
+      index: r.toString()
+    };
+  }
   clone() {
     return l.createWithData(
       new Map(this.tree),

package/data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../functions/web3/etherFunctions.cjs"),c=require("../../crypto/poseidon.cjs"),i=require("./MerkleTree.cjs"),g=(r,n,o,t)=>{if(!t||o){const e=i.MerkleTree.create(c.poseidonFunction,0n);return e.insert(BigInt(n.getAccessKey()),e.getStartIndex()),t||e.insert(s.randomBigInt(31),e.getStartIndex()+1n),e}return r};exports.getPatchedAccessTokenMerkleTree=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../functions/web3/etherFunctions.cjs"),c=require("../../crypto/poseidon.cjs"),i=require("./MerkleTree.cjs"),u=(r,n,o,t)=>{if(!t||o){const e=i.MerkleTree.create(c.poseidonFunction,0n);return e.insert(BigInt(n),e.getStartIndex()),t||e.insert(s.randomBigInt(31),e.getStartIndex()+1n),e}return r};exports.getPatchedAccessTokenMerkleTree=u;

package/data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.d.ts

@@ -1,3 +1,2 @@
-import { UserKeys } from '../crypto-keys/keys';
 import { MerkleTree } from './MerkleTree';
-export declare const getPatchedAccessTokenMerkleTree: (merkleTreeAccessToken: MerkleTree<bigint>, userKeys: UserKeys, patchAccessTokenMerkleTree: boolean, kycRequired: boolean) => MerkleTree<bigint>;
+export declare const getPatchedAccessTokenMerkleTree: (merkleTreeAccessToken: MerkleTree<bigint>, accessKey: string, patchAccessTokenMerkleTree: boolean, kycRequired: boolean) => MerkleTree<bigint>;

package/data-structures/merkle-tree/getPatchedAccessTokenMerkleTree.mjs

@@ -1,13 +1,13 @@
 import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
-import { poseidonFunction as s } from "../../crypto/poseidon.mjs";
-import { MerkleTree as c } from "./MerkleTree.mjs";
-const f = (r, n, o, t) => {
+import { poseidonFunction as m } from "../../crypto/poseidon.mjs";
+import { MerkleTree as s } from "./MerkleTree.mjs";
+const g = (r, n, o, t) => {
   if (!t || o) {
-    const e = c.create(s, 0n);
-    return e.insert(BigInt(n.getAccessKey()), e.getStartIndex()), t || e.insert(i(31), e.getStartIndex() + 1n), e;
+    const e = s.create(m, 0n);
+    return e.insert(BigInt(n), e.getStartIndex()), t || e.insert(i(31), e.getStartIndex() + 1n), e;
   }
   return r;
 };
 export {
-  f as getPatchedAccessTokenMerkleTree
+  g as getPatchedAccessTokenMerkleTree
 };

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

@@ -18,6 +18,6 @@ export declare class PresaleContractWrapper {
         priceMultiplier: bigint;
     }>;
     calculateHINK(amount: bigint): Promise<bigint>;
-    queryDeposits(): Promise<(ethers.Log | ethers.EventLog)[]>;
+    queryDeposits(): Promise<(ethers.EventLog | ethers.Log)[]>;
     onEvent(eventName: string, handleEvent: ethers.Listener): void;
 }