@hinkal/common 0.1.45 → 0.1.47

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../../constants/reorg-depths.constants.cjs"),c=require("../../functions/utils/resolve-sync.utils.cjs");require("ethers");require("axios");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("circomlibjs");const u=require("../../error-handling/logError.cjs");class g{contract;eventConfig;_latestBlockNumber;maxPageSize;isReady=!1;_onNewEvent;isServer;intervalId;inProgress;constructor(e,r,t,s,n){this.contract=e,this.eventConfig=r,this._latestBlockNumber=t,this.maxPageSize=n,this.isServer=s,this.inProgress=!1}get latestBlockNumber(){return this._latestBlockNumber}set onNewEvent(e){this._onNewEvent=e}intervalClear(){this.isReady=!1,this._onNewEvent=void 0,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")}emitNewEvent(e){this._onNewEvent?.(e)}getLastBlockNumberForEventRequest=async()=>{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-v.blockReorgDepth[r]+1)};async retrieveEvents(e,r=!1){try{if(this.requireReady(),this.inProgress&&!r)return!1;this.inProgress=!0;const t=await this.getLastBlockNumberForEventRequest();if(t<e)return this.inProgress=!1,!1;const s=c.getSequence(e,t,this.maxPageSize);return await c.resolveSync(s.map(({from:n,to:i})=>async()=>{const o=await this.contract.queryFilter(this.contract.filters[this.eventConfig.name](),n,i);let a=[];o.length>0&&(a=await this.processEventsPage(o),(this.eventConfig.name="NewCommitment")&&console.log("new events catched",{mappedEvents:a,events:o})),this._latestBlockNumber=i,await this.afterEventsAccepted(),a.length>0&&this.emitNewEvent()})),this.inProgress=!1,!0}catch(t){return u.logError("retrieveEvents error:",{err:t}),this.inProgress=!1,!1}}async processEventsPage(e){const r=[];return await c.resolveSync(e.map(t=>async()=>{const{args:s,blockNumber:n}=t;if((this.eventConfig.name="NewCommitment")&&console.log("args",{args:s}),!s)throw new Error("Wrong event structure");const i=this.mapEvent(s);await this.acceptEvent(i,n)&&r.push(i)})),r}handleEvent=async(...e)=>{const{args:r}=this.eventConfig,{blockNumber:t}=e[e.length-1],s=e.slice(0,r.length),n=r.reduce((a,l,h)=>(a[l]=s[h],a),{});if(!t)throw new Error("Wrong event structure");const i=this.mapEvent(n);if(!await this.acceptEvent(i,t))throw new Error("Failed to retrieve events");this._latestBlockNumber=t,await this.afterEventsAccepted(),this.emitNewEvent(i)}}exports.AbstractEventService=g;
+"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");require("ethers");require("axios");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("circomlibjs");const u=require("../../error-handling/logError.cjs");class g{contract;eventConfig;_latestBlockNumber;maxPageSize;isReady=!1;_onNewEvent;isServer;intervalId;inProgress;constructor(e,s,t,r,a){this.contract=e,this.eventConfig=s,this._latestBlockNumber=t,this.maxPageSize=a,this.isServer=r,this.inProgress=!1}get latestBlockNumber(){return this._latestBlockNumber}set onNewEvent(e){this._onNewEvent=e}intervalClear(){this.isReady=!1,this._onNewEvent=void 0,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")}emitNewEvent(e){this._onNewEvent?.(e)}getLastBlockNumberForEventRequest=async()=>{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){try{if(this.requireReady(),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);return await l.resolveSync(r.map(({from:a,to:i})=>async()=>{const o=await this.contract.queryFilter(this.contract.filters[this.eventConfig.name](),a,i);let n=[];if(o.length>0&&(n=await this.processEventsPage(o),this.eventConfig.name==="NewCommitment")){const c=await this.contract.signer.getAddress();console.log("new events catched",c,{mappedEvents:n,events:o})}this._latestBlockNumber=i,await this.afterEventsAccepted(),n.length>0&&this.emitNewEvent()})),this.inProgress=!1,!0}catch(t){return u.logError("retrieveEvents error:",{err:t}),this.inProgress=!1,!1}}async processEventsPage(e){const s=[];return await l.resolveSync(e.map(t=>async()=>{const{args:r,blockNumber:a}=t;if(this.eventConfig.name==="NewCommitment"){const n=await this.contract.signer.getAddress();console.log("args",n,{args:r})}if(!r)throw new Error("Wrong event structure");const i=this.mapEvent(r);await this.acceptEvent(i,a)&&s.push(i)})),s}handleEvent=async(...e)=>{const{args:s}=this.eventConfig,{blockNumber:t}=e[e.length-1],r=e.slice(0,s.length),a=s.reduce((n,c,h)=>(n[c]=r[h],n),{});if(!t)throw new Error("Wrong event structure");const i=this.mapEvent(a);if(!await this.acceptEvent(i,t))throw new Error("Failed to retrieve events");this._latestBlockNumber=t,await this.afterEventsAccepted(),this.emitNewEvent(i)}}exports.AbstractEventService=g;

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

@@ -1,5 +1,5 @@
 import { blockReorgDepth as v } from "../../constants/reorg-depths.constants.mjs";
-import { getSequence as m, resolveSync as c } from "../../functions/utils/resolve-sync.utils.mjs";
+import { getSequence as m, resolveSync as h } from "../../functions/utils/resolve-sync.utils.mjs";
 import "ethers";
 import "axios";
 import "../../constants/chains.constants.mjs";
@@ -20,8 +20,8 @@ class C {
   intervalId;
   inProgress;
   // to remove race conditions
-  constructor(e, s, t, r, n) {
-    this.contract = e, this.eventConfig = s, this._latestBlockNumber = t, this.maxPageSize = n, this.isServer = r, this.inProgress = !1;
+  constructor(e, s, t, r, a) {
+    this.contract = e, this.eventConfig = s, this._latestBlockNumber = t, this.maxPageSize = a, this.isServer = r, this.inProgress = !1;
   }
   get latestBlockNumber() {
     return this._latestBlockNumber;
@@ -62,15 +62,19 @@ class C {
       if (t < e)
         return this.inProgress = !1, !1;
       const r = m(e, t, this.maxPageSize);
-      return await c(
-        r.map(({ from: n, to: i }) => async () => {
+      return await h(
+        r.map(({ from: a, to: i }) => async () => {
           const o = await this.contract.queryFilter(
             this.contract.filters[this.eventConfig.name](),
-            n,
+            a,
             i
           );
-          let a = [];
-          o.length > 0 && (a = await this.processEventsPage(o), (this.eventConfig.name = "NewCommitment") && console.log("new events catched", { mappedEvents: a, events: o })), this._latestBlockNumber = i, await this.afterEventsAccepted(), a.length > 0 && this.emitNewEvent();
+          let n = [];
+          if (o.length > 0 && (n = await this.processEventsPage(o), this.eventConfig.name === "NewCommitment")) {
+            const c = await this.contract.signer.getAddress();
+            console.log("new events catched", c, { mappedEvents: n, events: o });
+          }
+          this._latestBlockNumber = i, await this.afterEventsAccepted(), n.length > 0 && this.emitNewEvent();
         })
       ), this.inProgress = !1, !0;
     } catch (t) {
@@ -79,21 +83,25 @@ class C {
   }
   async processEventsPage(e) {
     const s = [];
-    return await c(
+    return await h(
       e.map((t) => async () => {
-        const { args: r, blockNumber: n } = t;
-        if ((this.eventConfig.name = "NewCommitment") && console.log("args", { args: r }), !r)
+        const { args: r, blockNumber: a } = t;
+        if (this.eventConfig.name === "NewCommitment") {
+          const n = await this.contract.signer.getAddress();
+          console.log("args", n, { args: r });
+        }
+        if (!r)
           throw new Error("Wrong event structure");
         const i = this.mapEvent(r);
-        await this.acceptEvent(i, n) && s.push(i);
+        await this.acceptEvent(i, a) && s.push(i);
       })
     ), s;
   }
   handleEvent = async (...e) => {
-    const { args: s } = this.eventConfig, { blockNumber: t } = e[e.length - 1], r = e.slice(0, s.length), n = s.reduce((a, h, l) => (a[h] = r[l], a), {});
+    const { args: s } = this.eventConfig, { blockNumber: t } = e[e.length - 1], r = e.slice(0, s.length), a = s.reduce((n, c, l) => (n[c] = r[l], n), {});
     if (!t)
       throw new Error("Wrong event structure");
-    const i = this.mapEvent(n);
+    const i = this.mapEvent(a);
     if (!await this.acceptEvent(i, t))
       throw new Error("Failed to retrieve events");
     this._latestBlockNumber = t, await this.afterEventsAccepted(), this.emitNewEvent(i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hinkal/common",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "homepage": "hinkal.pro",
   "author": {
     "name": "Hinkal Protocol"