@hinkal/common 0.1.46 → 0.1.48

package/data-structures/Hinkal/resetMerkleTrees.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../constants/chains.constants.cjs"),n=require("../../functions/web3/events/balanceChangedHandler.cjs");require("../../types/circom-data.types.cjs");const r=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const s=require("../snapshot/ClientAccessTokenSnapshotService.cjs"),i=require("../snapshot/ClientCommitmentsSnapshotService.cjs"),o=require("../snapshot/ClientNullifierSnapshotService.cjs"),a=async e=>{const{maxPageSize:t}=c.networkRegistry[e.getCurrentChainId()];e.commitmentsSnapshotService?.intervalClear(),e.commitmentsSnapshotService=new i.ClientCommitmentsSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.nullifierSnapshotService?.intervalClear(),e.nullifierSnapshotService=new o.ClientNullifierSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.accessTokenSnapshotService?.intervalClear(),e.accessTokenSnapshotService=new s.ClientAccessTokenSnapshotService(e.getContractWithFetcher(r.ContractType.CrossChainAccessTokenContract),t),await Promise.all([e.commitmentsSnapshotService.init(),e.nullifierSnapshotService.init(),e.accessTokenSnapshotService.init()]),e.merkleTreeHinkal=e.commitmentsSnapshotService.merkleTree,e.merkleTreeAccessToken=e.accessTokenSnapshotService.merkleTree,e.nullifiers=e.nullifierSnapshotService.nullifiers,e.encryptedOutputs=e.commitmentsSnapshotService.encryptedOutputs,e.commitmentsSnapshotService.onNewEvent=n.balanceChangedHandler,e.nullifierSnapshotService.onNewEvent=n.balanceChangedHandler};exports.resetMerkleTrees=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../constants/chains.constants.cjs"),n=require("../../functions/web3/events/balanceChangedHandler.cjs");require("../../types/circom-data.types.cjs");const r=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const c=require("../snapshot/ClientAccessTokenSnapshotService.cjs"),i=require("../snapshot/ClientCommitmentsSnapshotService.cjs"),o=require("../snapshot/ClientNullifierSnapshotService.cjs"),a=async e=>{const{maxPageSize:t}=s.networkRegistry[e.getCurrentChainId()];await e.getEthereumAddress(),e.commitmentsSnapshotService?.intervalClear(),e.commitmentsSnapshotService=new i.ClientCommitmentsSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.nullifierSnapshotService?.intervalClear(),e.nullifierSnapshotService=new o.ClientNullifierSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.accessTokenSnapshotService?.intervalClear(),e.accessTokenSnapshotService=new c.ClientAccessTokenSnapshotService(e.getContractWithFetcher(r.ContractType.CrossChainAccessTokenContract),t),await Promise.all([e.commitmentsSnapshotService.init(),e.nullifierSnapshotService.init(),e.accessTokenSnapshotService.init()]),e.merkleTreeHinkal=e.commitmentsSnapshotService.merkleTree,e.merkleTreeAccessToken=e.accessTokenSnapshotService.merkleTree,e.nullifiers=e.nullifierSnapshotService.nullifiers,e.encryptedOutputs=e.commitmentsSnapshotService.encryptedOutputs,e.commitmentsSnapshotService.onNewEvent=n.balanceChangedHandler,e.nullifierSnapshotService.onNewEvent=n.balanceChangedHandler};exports.resetMerkleTrees=a;

package/data-structures/Hinkal/resetMerkleTrees.mjs

@@ -1,21 +1,21 @@
-import { networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { networkRegistry as c } from "../../constants/chains.constants.mjs";
 import { balanceChangedHandler as o } from "../../functions/web3/events/balanceChangedHandler.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as r } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
-import { ClientAccessTokenSnapshotService as c } from "../snapshot/ClientAccessTokenSnapshotService.mjs";
-import { ClientCommitmentsSnapshotService as i } from "../snapshot/ClientCommitmentsSnapshotService.mjs";
-import { ClientNullifierSnapshotService as s } from "../snapshot/ClientNullifierSnapshotService.mjs";
+import { ClientAccessTokenSnapshotService as n } from "../snapshot/ClientAccessTokenSnapshotService.mjs";
+import { ClientCommitmentsSnapshotService as s } from "../snapshot/ClientCommitmentsSnapshotService.mjs";
+import { ClientNullifierSnapshotService as i } from "../snapshot/ClientNullifierSnapshotService.mjs";
 const T = async (e) => {
-  const { maxPageSize: t } = n[e.getCurrentChainId()];
-  e.commitmentsSnapshotService?.intervalClear(), e.commitmentsSnapshotService = new i(
+  const { maxPageSize: t } = c[e.getCurrentChainId()];
+  await e.getEthereumAddress(), e.commitmentsSnapshotService?.intervalClear(), e.commitmentsSnapshotService = new s(
     e.getContractWithFetcher(r.HinkalContract),
     t
-  ), e.nullifierSnapshotService?.intervalClear(), e.nullifierSnapshotService = new s(
+  ), e.nullifierSnapshotService?.intervalClear(), e.nullifierSnapshotService = new i(
     e.getContractWithFetcher(r.HinkalContract),
     t
-  ), e.accessTokenSnapshotService?.intervalClear(), e.accessTokenSnapshotService = new c(
+  ), e.accessTokenSnapshotService?.intervalClear(), e.accessTokenSnapshotService = new n(
     e.getContractWithFetcher(r.CrossChainAccessTokenContract),
     t
   ), await Promise.all([

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"),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;ethAddress;constructor(e,s,t,r,n){this.contract=e,this.eventConfig=s,this._latestBlockNumber=t,this.maxPageSize=n,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=c.getSequence(e,t,this.maxPageSize);return await c.resolveSync(r.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",this.ethAddress,{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 s=[];return await c.resolveSync(e.map(t=>async()=>{const{args:r,blockNumber:n}=t;if(this.eventConfig.name==="NewCommitment"&&console.log("args",this.ethAddress,{args:r}),!r)throw new Error("Wrong event structure");const i=this.mapEvent(r);await this.acceptEvent(i,n)&&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,l,h)=>(a[l]=r[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;

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

@@ -14,6 +14,7 @@ export declare abstract class AbstractEventService<EventType, SerializedEventTyp
     protected isServer: boolean;
     protected intervalId?: any;
     protected inProgress: boolean;
+    protected ethAddress: string;
     protected constructor(contract: ethers.Contract, eventConfig: EventConfig, initialBlockNumber: number, isServer: boolean, maxPageSize?: number);
     get latestBlockNumber(): number;
     set onNewEvent(value: NewEventListener<EventType>);

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

@@ -20,6 +20,7 @@ class C {
   intervalId;
   inProgress;
   // to remove race conditions
+  ethAddress;
   constructor(e, s, t, r, n) {
     this.contract = e, this.eventConfig = s, this._latestBlockNumber = t, this.maxPageSize = n, this.isServer = r, this.inProgress = !1;
   }
@@ -70,7 +71,7 @@ class C {
             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();
+          o.length > 0 && (a = await this.processEventsPage(o), this.eventConfig.name === "NewCommitment" && console.log("new events catched", this.ethAddress, { mappedEvents: a, events: o })), this._latestBlockNumber = i, await this.afterEventsAccepted(), a.length > 0 && this.emitNewEvent();
         })
       ), this.inProgress = !1, !0;
     } catch (t) {
@@ -82,7 +83,7 @@ class C {
     return await c(
       e.map((t) => async () => {
         const { args: r, blockNumber: n } = t;
-        if (this.eventConfig.name === "NewCommitment" && console.log("args", { args: r }), !r)
+        if (this.eventConfig.name === "NewCommitment" && console.log("args", this.ethAddress, { args: r }), !r)
           throw new Error("Wrong event structure");
         const i = this.mapEvent(r);
         await this.acceptEvent(i, n) && s.push(i);

package/data-structures/snapshot/ClientCommitmentsSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("circomlibjs");require("ethers");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const r=require("../../API/fetchCommitmentsCache.cjs"),s=require("../event-service/AbstractCommitmentsSnapshotService.cjs");class i extends s.AbstractCommitmentsSnapshotService{constructor(t,e){super(t,0,!1,e)}async fetchSnapshot(){const{chainId:t}=await this.contract.provider.getNetwork(),e=await r.fetchCommitmentsSnapshot(t);if(e.hinkalAddress!==this.contract.address||e.chainId!==t)throw Error("Commitment Snapshot: incorrect contract or chain id");return{latestBlockNumber:e.latestBlockNumber,merkleTree:e.merkleTree,encryptedOutputs:e.encryptedOutputs}}persistSnapshot(t){return Promise.resolve()}}exports.ClientCommitmentsSnapshotService=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("circomlibjs");require("ethers");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const s=require("../../API/fetchCommitmentsCache.cjs"),i=require("../event-service/AbstractCommitmentsSnapshotService.cjs");class n extends i.AbstractCommitmentsSnapshotService{constructor(t,e,r){super(t,0,!1,e),this.ethAddress=r}async fetchSnapshot(){const{chainId:t}=await this.contract.provider.getNetwork(),e=await s.fetchCommitmentsSnapshot(t);if(e.hinkalAddress!==this.contract.address||e.chainId!==t)throw Error("Commitment Snapshot: incorrect contract or chain id");return{latestBlockNumber:e.latestBlockNumber,merkleTree:e.merkleTree,encryptedOutputs:e.encryptedOutputs}}persistSnapshot(t){return Promise.resolve()}}exports.ClientCommitmentsSnapshotService=n;

package/data-structures/snapshot/ClientCommitmentsSnapshotService.d.ts

@@ -1,7 +1,7 @@
 import { AbstractCommitmentsSnapshotService, CommitmentsSerializedSnapshot } from '../event-service';
 import { Contract } from 'ethers';
 export declare class ClientCommitmentsSnapshotService extends AbstractCommitmentsSnapshotService {
-    constructor(contract: Contract, maxPageSize?: number);
+    constructor(contract: Contract, maxPageSize?: number, ethAddress?: string);
     protected fetchSnapshot(): Promise<CommitmentsSerializedSnapshot>;
     protected persistSnapshot(_serializedSnapshot: CommitmentsSerializedSnapshot): Promise<unknown>;
 }

package/data-structures/snapshot/ClientCommitmentsSnapshotService.mjs

@@ -7,14 +7,14 @@ import "../../constants/chains.constants.mjs";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
-import { fetchCommitmentsSnapshot as e } from "../../API/fetchCommitmentsCache.mjs";
-import { AbstractCommitmentsSnapshotService as o } from "../event-service/AbstractCommitmentsSnapshotService.mjs";
-class f extends o {
-  constructor(r, t) {
-    super(r, 0, !1, t);
+import { fetchCommitmentsSnapshot as o } from "../../API/fetchCommitmentsCache.mjs";
+import { AbstractCommitmentsSnapshotService as s } from "../event-service/AbstractCommitmentsSnapshotService.mjs";
+class k extends s {
+  constructor(r, t, e) {
+    super(r, 0, !1, t), this.ethAddress = e;
   }
   async fetchSnapshot() {
-    const { chainId: r } = await this.contract.provider.getNetwork(), t = await e(r);
+    const { chainId: r } = await this.contract.provider.getNetwork(), t = await o(r);
     if (t.hinkalAddress !== this.contract.address || t.chainId !== r)
       throw Error("Commitment Snapshot: incorrect contract or chain id");
     return {
@@ -28,5 +28,5 @@ class f extends o {
   }
 }
 export {
-  f as ClientCommitmentsSnapshotService
+  k as ClientCommitmentsSnapshotService
 };

package/package.json

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