@hinkal/common 0.2.21 → 0.2.22

package/data-structures/crypto-keys/keys.mjs

@@ -1,18 +1,21 @@
-import { Keypair as u } from "@solana/web3.js";
-import m from "bs58";
-import { utils as h, ethers as c } from "ethers";
-import { ethers as K } from "ethers-v6h";
-import p from "libsodium-wrappers";
-import { CIRCOM_P as d } from "../../constants/protocol.constants.mjs";
-import { babyJubInstance as P } from "../../crypto/babyJub.mjs";
-import { poseidonHash as a } from "../../crypto/poseidon.mjs";
-import { AttachableMemoryCacheDevice as l } from "../cacheDevices/AttachableMemoryCacheDevice.mjs";
-import { getCircomSign as g } from "./keyUtils.mjs";
-const v = new l(), f = new l(), D = {
+import { utils as o, ethers as d } from "ethers";
+import w from "libsodium-wrappers";
+import { CIRCOM_P as m } from "../../constants/protocol.constants.mjs";
+import { babyJubInstance as b } from "../../crypto/babyJub.mjs";
+import { poseidonHash as c } from "../../crypto/poseidon.mjs";
+import { getCircomSign as y } from "./keyUtils.mjs";
+import { AttachableMemoryCacheDevice as v } from "../cacheDevices/AttachableMemoryCacheDevice.mjs";
+import { ethers as u, hexlify as F } from "ethers-v6h";
+import { isSolanaLike as h, networkRegistry as p } from "../../constants/chains.constants.mjs";
+import { Keypair as g, VersionedTransaction as K } from "@solana/web3.js";
+import k from "tweetnacl";
+import P from "bs58";
+import { createCustomSolanaConnection as A } from "../../functions/utils/create-provider.mjs";
+const E = new v(), R = new v(), L = {
   privateKey: "",
   publicKey: ""
 };
-class x {
+class l {
   signature;
   constructor(e) {
     this.signature = e;
@@ -28,76 +31,133 @@ class x {
       throw Error("No signature provided");
   }
   verifyMessage(e) {
-    return this.requireSignature(), h.verifyMessage(e, this.signature);
+    return this.requireSignature(), o.verifyMessage(e, this.signature);
   }
   /**
    * get shielded private key from message signature used to login to the application,
    * this private key is used to generate encryption keypairs as well as public key
    * @retuns 0x-prefixed shielded private key
    */
-  getShieldedPrivateKey = () => (this.requireSignature(), c.utils.keccak256(this.signature));
+  getShieldedPrivateKey = () => (this.requireSignature(), d.utils.keccak256(this.signature));
   /**
    * generate shielded public key from private key
    * @param privateKey the key used to generate the shielded public key, this should be the signature
    * that the user provided
    * @retuns shielded public key in hexstring with 0x prefixed
    */
-  getShieldedPublicKey = () => (this.requireSignature(), a(this.getShieldedPrivateKey()));
+  getShieldedPublicKey = () => (this.requireSignature(), c(this.getShieldedPrivateKey()));
   /**
    * deterministically derive an EVM address from the shielded private key
    */
-  getDerivedEthereumAddress = () => (this.requireSignature(), new K.Wallet(this.getShieldedPrivateKey()).address);
+  getDerivedEthereumAddress = () => (this.requireSignature(), new u.Wallet(this.getShieldedPrivateKey()).address);
   /**
    * deterministically derive a Solana public key from the shielded private key
    */
-  getDerivedSolanaPublicKey = () => (this.requireSignature(), u.fromSeed(h.arrayify(this.getShieldedPrivateKey())).publicKey.toBase58());
+  getDerivedSolanaPublicKey = () => (this.requireSignature(), g.fromSeed(o.arrayify(this.getShieldedPrivateKey())).publicKey.toBase58());
   /**
    * generate access token, this accessKey is what should be sent to the server for signing
    * @returns accessKey in hexstring with 0x prefixed
    */
-  getAccessKey = () => (this.requireSignature(), a(this.getShieldedPrivateKey(), this.getShieldedPublicKey()));
+  getAccessKey = () => (this.requireSignature(), c(this.getShieldedPrivateKey(), this.getShieldedPublicKey()));
   getSignerPrivateKeyFromNonce = (e) => {
     this.requireSignature();
-    const t = a(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
-    return h.keccak256(h.toUtf8Bytes(t));
+    const r = c(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
+    return o.keccak256(o.toUtf8Bytes(r));
   };
   getSignerSolanaPrivateKeyFromNonce = (e) => {
-    const t = this.getSignerPrivateKeyFromNonce(e), r = h.arrayify(t), i = u.fromSeed(r);
-    return m.encode(i.secretKey);
+    const r = this.getSignerPrivateKeyFromNonce(e), t = o.arrayify(r), i = g.fromSeed(t);
+    return P.encode(i.secretKey);
   };
-  getWalletSalt = (e) => (this.requireSignature(), a(this.getShieldedPublicKey(), this.getShieldedPrivateKey(), e));
+  getEvmPrivateKeyFromSolanaPrivateKey = (e) => {
+    const t = P.decode(e).slice(0, 32);
+    return F(t);
+  };
+  static getSignerFromPrivateKey = (e, r) => {
+    if (h(e)) {
+      const i = o.arrayify(r);
+      return g.fromSeed(i);
+    }
+    return new u.Wallet(r);
+  };
+  static getSignerAddressFromPrivateKey(e, r) {
+    const t = l.getSignerFromPrivateKey(e, r);
+    return t instanceof g ? t.publicKey.toString() : t.address;
+  }
+  static signMessageFromPrivateKey = async (e, r, t) => {
+    const i = l.getSignerFromPrivateKey(e, r);
+    if (i instanceof g) {
+      const a = o.isHexString(t) ? o.arrayify(t) : new TextEncoder().encode(t), s = k.sign.detached(a, i.secretKey);
+      return `0x${Buffer.from(s).toString("hex")}`;
+    }
+    const n = o.isHexString(t) ? o.arrayify(t) : t;
+    return i.signMessage(n);
+  };
+  static signSolanaTransactionFromPrivateKey = (e, r, t) => {
+    if (!h(e))
+      throw new Error("Solana transaction signing is only available for Solana chains");
+    const i = l.getSignerFromPrivateKey(e, r);
+    if (!(i instanceof g))
+      throw new Error("Unable to derive Solana keypair for signing");
+    t.sign([i]);
+  };
+  static sendAndSignTransactionFromPrivateKey = async (e, r, t) => {
+    const i = l.getSignerFromPrivateKey(e, r), { fetchRpcUrl: n } = p[e];
+    if (!n)
+      throw new Error("No RPC URL found for chainId");
+    if (i instanceof g) {
+      if (!(t instanceof K))
+        throw new Error("Invalid transaction type for Solana");
+      return t.sign([i]), await A(n).sendRawTransaction(t.serialize());
+    }
+    if (t instanceof K)
+      throw new Error("Invalid transaction type for EVM");
+    const a = new u.JsonRpcProvider(n);
+    return (await i.connect(a).sendTransaction(t)).hash;
+  };
+  static signTypedDataFromPrivateKey = async (e, r, t, i, n) => {
+    if (h(e))
+      throw new Error("Solana does not support typed data");
+    return await l.getSignerFromPrivateKey(e, r).signTypedData(t, i, n);
+  };
+  static authorizeDelegation = async (e, r, t, i) => {
+    if (h(e))
+      throw new Error("Solana does not support delegation");
+    const n = new u.JsonRpcProvider(p[e].fetchRpcUrl);
+    return await l.getSignerFromPrivateKey(e, r).connect(n).authorize({ address: t, ...i !== void 0 && { nonce: i } });
+  };
+  getWalletSalt = (e) => (this.requireSignature(), c(this.getShieldedPublicKey(), this.getShieldedPrivateKey(), e));
   /**
    * generate inHinkalAddress - a user unique address linking him with a specific app
    * @returns inHinkalAddress in bigint
    */
   getInHinkalAddress = (e) => {
     this.requireSignature();
-    const t = a(this.getShieldedPrivateKey(), e);
-    return BigInt(t);
+    const r = c(this.getShieldedPrivateKey(), e);
+    return BigInt(r);
   };
   /**
    * generate backend token, which is used for access control on backend
    * @returns accessKey in hexstring with 0x prefixed
    */
-  getBackendToken = () => (this.requireSignature(), a(this.getAccessKey(), this.getShieldedPublicKey()));
-  static getRandomizedStealthPair = v.attach(
-    (e, t) => {
-      const r = P(), i = BigInt(t) % d, n = e * i % d, s = r.mulPointEscalar(r.Base8, e), o = r.mulPointEscalar(r.Base8, n), y = [BigInt(r.F.toString(s[0])), BigInt(r.F.toString(s[1]))], S = [BigInt(r.F.toString(o[0])), BigInt(r.F.toString(o[1]))];
-      return { H0: y, H1: S };
+  getBackendToken = () => (this.requireSignature(), c(this.getAccessKey(), this.getShieldedPublicKey()));
+  static getRandomizedStealthPair = E.attach(
+    (e, r) => {
+      const t = b(), i = BigInt(r) % m, n = e * i % m, a = t.mulPointEscalar(t.Base8, e), s = t.mulPointEscalar(t.Base8, n), S = [BigInt(t.F.toString(a[0])), BigInt(t.F.toString(a[1]))], f = [BigInt(t.F.toString(s[0])), BigInt(t.F.toString(s[1]))];
+      return { H0: S, H1: f };
     }
   );
-  static getStealthAddressCompressedPoints = (e, t) => {
-    const { H0: r, H1: i } = this.getRandomizedStealthPair(e, t), [n, s] = [r, i].map((o) => BigInt(o[1]) + 2n ** 255n * g(o[0]));
-    return { h0: n, h1: s };
+  static getStealthAddressCompressedPoints = (e, r) => {
+    const { H0: t, H1: i } = this.getRandomizedStealthPair(e, r), [n, a] = [t, i].map((s) => BigInt(s[1]) + 2n ** 255n * y(s[0]));
+    return { h0: n, h1: a };
   };
-  static getStealthAddress = f.attach((e, t) => {
-    const { H0: r, H1: i } = this.getRandomizedStealthPair(e, t), s = [2n * g(r[0]) + g(i[0]), r[1], i[1]];
-    return a(...s);
+  static getStealthAddress = R.attach((e, r) => {
+    const { H0: t, H1: i } = this.getRandomizedStealthPair(e, r), a = [2n * y(t[0]) + y(i[0]), t[1], i[1]];
+    return c(...a);
   });
-  static getStealthAddressWithEKey = (e, t) => ({ stealthAddress: this.getStealthAddress(e, t), encryptionKey: this.getEncryptionKeyPair(t).publicKey });
-  static checkSignature = (e, t, r, i) => {
-    const { h0: n, h1: s } = this.getStealthAddressCompressedPoints(e, i);
-    return t === n && r === s;
+  static getStealthAddressWithEKey = (e, r) => ({ stealthAddress: this.getStealthAddress(e, r), encryptionKey: this.getEncryptionKeyPair(r).publicKey });
+  static checkSignature = (e, r, t, i) => {
+    const { h0: n, h1: a } = this.getStealthAddressCompressedPoints(e, i);
+    return r === n && t === a;
   };
   /**
    * generate private and public keypair
@@ -105,16 +165,16 @@ class x {
    * and must correspond to 32 bytes
    */
   static getEncryptionKeyPair = (e) => {
-    const t = p.crypto_box_seed_keypair(c.utils.arrayify(e));
+    const r = w.crypto_box_seed_keypair(d.utils.arrayify(e));
     return {
-      privateKey: c.utils.hexlify(t.privateKey),
-      publicKey: c.utils.hexlify(t.publicKey)
+      privateKey: d.utils.hexlify(r.privateKey),
+      publicKey: d.utils.hexlify(r.publicKey)
     };
   };
 }
 export {
-  D as EncryptionKeyPairDefaultValue,
-  x as UserKeys,
-  f as stealthAddressCacheDevice,
-  v as stealthPairCacheDevice
+  L as EncryptionKeyPairDefaultValue,
+  l as UserKeys,
+  R as stealthAddressCacheDevice,
+  E as stealthPairCacheDevice
 };

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@ import { AbstractSnapshotService, Snapshot } from './AbstractSnapshotService';
 import { NewApprovedUtxoEvent } from '../../../types/commitments.types';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
 import { ApprovedUtxo } from '../../../types/hinkal.types';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type ApprovalsSnapshotPayload = {
     readonly approvals: Map<string, ApprovedUtxo[]>;
     readonly events: Set<string>;
@@ -12,7 +11,7 @@ export type ApprovalsSerializedSnapshot = {
     approvals: Record<string, ApprovedUtxo<string>[]>;
     events: string[];
 };
-export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
+export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, NewApprovedUtxoEvent<string>, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _approvals;
     events: Set<string>;
@@ -25,6 +24,6 @@ export declare abstract class AbstractApprovalsSnapshotService extends AbstractS
         events: Set<string>;
     };
     protected populateSnapshot({ payload: { approvals, events } }: Snapshot<ApprovalsSnapshotPayload>): void;
-    protected mapEvent(event: BlockchainEvent): NewApprovedUtxoEvent;
+    protected mapEvent(event: NewApprovedUtxoEvent<string>): NewApprovedUtxoEvent;
     protected acceptEvent(event: NewApprovedUtxoEvent, _blockNumber: number, txHash: string): boolean;
 }

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

@@ -1,7 +1,7 @@
 import { AbstractSnapshotService as c } from "./AbstractSnapshotService.mjs";
 import { toBigInt as v } from "../../../functions/utils/amounts.utils.mjs";
-import { caseInsensitiveEqual as A } from "../../../functions/utils/caseInsensitive.utils.mjs";
-class f extends c {
+import { caseInsensitiveEqual as u } from "../../../functions/utils/caseInsensitive.utils.mjs";
+class g extends c {
   constructor(e) {
     super(e, "NewApprovedUtxo");
   }
@@ -57,7 +57,7 @@ class f extends c {
     this._approvals = e, this.events = t;
   }
   mapEvent(e) {
-    const t = e.getArg("approveTo"), s = e.getArg("tokenAddress"), r = e.getArg("amount"), p = e.getArg("inHinkalAddress");
+    const { approveTo: t, tokenAddress: s, amount: r, inHinkalAddress: p } = e;
     return {
       approveTo: t,
       tokenAddress: s,
@@ -75,7 +75,7 @@ class f extends c {
       };
       let a = this.approvals.get(e.approveTo) || [], d = !1;
       for (let o = 0; o < a.length; o += 1)
-        A(i, a[o].tokenAddress) && l === a[o].inHinkalAddress && (a[o].amount += p, d = !0);
+        u(i, a[o].tokenAddress) && l === a[o].inHinkalAddress && (a[o].amount += p, d = !0);
       if (a = a.filter((o) => o.amount !== 0n), d && a.length === 0)
         this.approvals.delete(e.approveTo);
       else {
@@ -88,5 +88,5 @@ class f extends c {
   }
 }
 export {
-  f as AbstractApprovalsSnapshotService
+  g as AbstractApprovalsSnapshotService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const l=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const u=require("../../../functions/utils/amounts.utils.cjs"),o=require("./AbstractSnapshotService.cjs"),p=require("../../../functions/utils/merkleTree.utils.cjs");class m extends o.AbstractSnapshotService{constructor(e){super(e,"NewCommitment")}_merkleTree;_encryptedOutputs;get merkleTree(){return this._merkleTree}get encryptedOutputs(){return this._encryptedOutputs}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),latestBlockNumber:e.latestBlockNumber,encryptedOutputs:e.payload.encryptedOutputs.map(t=>({value:t.value,isPositive:String(t.isPositive),isBlocked:t.isBlocked??!1}))}}deserializeSnapshot(e){let t;e.latestBlockNumber&&e.merkleTree?t=p.contructMerkleTreeFromSerialized(e.merkleTree):t=l.MerkleTree.create(n.poseidonFunction,0n);const s=e.encryptedOutputs?.map(r=>({value:r.value,isPositive:JSON.parse(r.isPositive),isBlocked:r.isBlocked??!1}));return{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:t,encryptedOutputs:s||[]}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t}}){this._merkleTree=e,this._encryptedOutputs=t}mapEvent(e){const t=e.getArg("commitment"),s=e.getArg("index"),r=e.getArg("encryptedOutput");return{commitment:u.toBigInt(t),index:u.toBigInt(s),encryptedOutput:r}}acceptEvent(e,t,s,r){if(!this.encryptedOutputs.map(i=>i.value).includes(e.encryptedOutput)){if(!this._merkleTree.insert(e.commitment,e.index>=0?e.index:-1n*e.index))return!1;const c={value:e.encryptedOutput,isPositive:e.index>=0n,isBlocked:r??!1};return this._encryptedOutputs.push(c),!0}return!1}}exports.AbstractCommitmentsSnapshotService=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../../crypto/poseidon.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const l=require("../../merkle-tree/MerkleTree.cjs");require("ethers");require("../../../error-handling/error-codes.constants.cjs");const u=require("../../../functions/utils/amounts.utils.cjs"),o=require("./AbstractSnapshotService.cjs"),p=require("../../../functions/utils/merkleTree.utils.cjs");class a extends o.AbstractSnapshotService{constructor(e){super(e,"NewCommitment")}_merkleTree;_encryptedOutputs;get merkleTree(){return this._merkleTree}get encryptedOutputs(){return this._encryptedOutputs}serializeSnapshot(e){return{merkleTree:e.payload.merkleTree.toJSON(),latestBlockNumber:e.latestBlockNumber,encryptedOutputs:e.payload.encryptedOutputs.map(t=>({value:t.value,isPositive:String(t.isPositive),isBlocked:t.isBlocked??!1}))}}deserializeSnapshot(e){let t;e.latestBlockNumber&&e.merkleTree?t=p.contructMerkleTreeFromSerialized(e.merkleTree):t=l.MerkleTree.create(c.poseidonFunction,0n);const s=e.encryptedOutputs?.map(r=>({value:r.value,isPositive:JSON.parse(r.isPositive),isBlocked:r.isBlocked??!1}));return{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:t,encryptedOutputs:s||[]}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t}}){this._merkleTree=e,this._encryptedOutputs=t}mapEvent(e){const{commitment:t,index:s,encryptedOutput:r}=e;return{commitment:u.toBigInt(t),index:u.toBigInt(s),encryptedOutput:r}}acceptEvent(e,t,s,r){if(!this.encryptedOutputs.map(i=>i.value).includes(e.encryptedOutput)){if(!this._merkleTree.insert(e.commitment,e.index>=0?e.index:-1n*e.index))return!1;const n={value:e.encryptedOutput,isPositive:e.index>=0n,isBlocked:r??!1};return this._encryptedOutputs.push(n),!0}return!1}}exports.AbstractCommitmentsSnapshotService=a;

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

@@ -2,7 +2,6 @@ import { MerkleTree, MerkleTreeJson } from '../../merkle-tree';
 import { CommitmentEvent, EncryptedOutputWithSign } from '../../../types';
 import { AbstractSnapshotService, Snapshot } from './AbstractSnapshotService';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type CommitmentsSnapshotPayload = {
     readonly merkleTree: MerkleTree<bigint>;
     readonly encryptedOutputs: EncryptedOutputWithSign[];
@@ -12,7 +11,7 @@ export type CommitmentsSerializedSnapshot = {
     merkleTree?: MerkleTreeJson;
     encryptedOutputs?: EncryptedOutputWithSign<string>[];
 };
-export declare abstract class AbstractCommitmentsSnapshotService extends AbstractSnapshotService<CommitmentEvent<bigint>, CommitmentsSnapshotPayload, CommitmentsSerializedSnapshot> {
+export declare abstract class AbstractCommitmentsSnapshotService extends AbstractSnapshotService<CommitmentEvent<bigint>, CommitmentEvent, CommitmentsSnapshotPayload, CommitmentsSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _merkleTree;
     private _encryptedOutputs;
@@ -25,6 +24,6 @@ export declare abstract class AbstractCommitmentsSnapshotService extends Abstrac
         encryptedOutputs: EncryptedOutputWithSign<boolean>[];
     };
     protected populateSnapshot({ payload: { merkleTree, encryptedOutputs }, }: Snapshot<CommitmentsSnapshotPayload>): void;
-    protected mapEvent(event: BlockchainEvent): CommitmentEvent<bigint>;
+    protected mapEvent(event: CommitmentEvent): CommitmentEvent<bigint>;
     protected acceptEvent(event: CommitmentEvent<bigint>, _blockNumber: number, _txHash?: string, isBlocked?: boolean): boolean;
 }

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

@@ -1,15 +1,15 @@
-import { poseidonFunction as c } from "../../../crypto/poseidon.mjs";
+import { poseidonFunction as m } from "../../../crypto/poseidon.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-import { MerkleTree as m } from "../../merkle-tree/MerkleTree.mjs";
+import { MerkleTree as c } from "../../merkle-tree/MerkleTree.mjs";
 import "ethers";
 import "../../../error-handling/error-codes.constants.mjs";
 import { toBigInt as p } from "../../../functions/utils/amounts.utils.mjs";
 import { AbstractSnapshotService as o } from "./AbstractSnapshotService.mjs";
 import { contructMerkleTreeFromSerialized as n } from "../../../functions/utils/merkleTree.utils.mjs";
-class x extends o {
+class b extends o {
   constructor(e) {
     super(e, "NewCommitment");
   }
@@ -34,7 +34,7 @@ class x extends o {
   }
   deserializeSnapshot(e) {
     let t;
-    e.latestBlockNumber && e.merkleTree ? t = n(e.merkleTree) : t = m.create(c, 0n);
+    e.latestBlockNumber && e.merkleTree ? t = n(e.merkleTree) : t = c.create(m, 0n);
     const s = e.encryptedOutputs?.map((r) => ({
       value: r.value,
       isPositive: JSON.parse(r.isPositive),
@@ -60,7 +60,7 @@ class x extends o {
     this._merkleTree = e, this._encryptedOutputs = t;
   }
   mapEvent(e) {
-    const t = e.getArg("commitment"), s = e.getArg("index"), r = e.getArg("encryptedOutput");
+    const { commitment: t, index: s, encryptedOutput: r } = e;
     return {
       commitment: p(t),
       index: p(s),
@@ -82,5 +82,5 @@ class x extends o {
   }
 }
 export {
-  x as AbstractCommitmentsSnapshotService
+  b as AbstractCommitmentsSnapshotService
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../../functions/utils/resolve-sync.utils.cjs");class h{blockchainEventEmitter;eventName;constructor(t,s){this.blockchainEventEmitter=t,this.eventName=s,t.addEventProcessorFunction(this.processEventsPage.bind(this))}get latestBlockNumber(){return this.blockchainEventEmitter.latestBlockNumber}get chainId(){return this.blockchainEventEmitter.chainId}intervalClear(){this.blockchainEventEmitter.intervalClear()}async processEventsPage(t){const s=new Set;t.forEach(({eventName:e,transactionHash:c})=>{e==="BlockedUtxosCreated"&&s.add(c)});const n=[];await l.resolveSync(t.map(e=>async()=>{if(e.eventName!==this.eventName)return;const{blockNumber:c,transactionHash:a}=e,r=this.mapEvent(e),o=s.has(a);await this.acceptEvent(r,c,a,o)&&n.push(r)}));const i=n.length;return await this.afterEventsAccepted(i),n.length}}exports.AbstractEventService=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../../../functions/utils/resolve-sync.utils.cjs");class h{blockchainEventEmitter;eventName;constructor(e,t){this.blockchainEventEmitter=e,this.eventName=t,e.addEventProcessorFunction(this.processEventsPage.bind(this))}get latestBlockNumber(){return this.blockchainEventEmitter.latestBlockNumber}intervalClear(){this.blockchainEventEmitter.intervalClear()}async processEventsPage(e){const t=new Set;e.forEach(({event:s,transactionHash:n})=>{s==="BlockedUtxosCreated"&&t.add(n)});const c=[];await v.resolveSync(e.map(s=>async()=>{if(s.event!==this.eventName)return;const{args:n,blockNumber:i,transactionHash:r}=s;if(!n)throw new Error("Wrong event structure");const a=this.mapEvent(n),l=t.has(r);await this.acceptEvent(a,i,r,l)&&c.push(a)}));const o=c.length;return await this.afterEventsAccepted(o),c.length}}exports.AbstractEventService=h;

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
+import { BigNumber } from 'ethers';
 import { NullifierEvent } from '../../../types/commitments.types';
 import { AbstractSnapshotService, Snapshot } from './AbstractSnapshotService';
 import { BlockchainEventEmitter } from './BlockchainEventEmitter';
-import { BlockchainEvent } from '../../BlockchainEvent/BlockchainEvent';
 export type NullifierSnapshotPayload = {
     readonly nullifiers: Set<string>;
 };
@@ -9,14 +9,14 @@ export type NullifierSerializedSnapshot = {
     latestBlockNumber?: number;
     nullifiers?: string[];
 };
-export declare abstract class AbstractNullifierSnapshotService extends AbstractSnapshotService<NullifierEvent<string>, NullifierSnapshotPayload, NullifierSerializedSnapshot> {
+export declare abstract class AbstractNullifierSnapshotService extends AbstractSnapshotService<NullifierEvent<string>, NullifierEvent<BigNumber>, NullifierSnapshotPayload, NullifierSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _nullifiers;
     get nullifiers(): Set<string>;
     protected serializeSnapshot(snapshot: Snapshot<NullifierSnapshotPayload>): NullifierSerializedSnapshot;
     protected deserializeSnapshot(serializedSnapshot: NullifierSerializedSnapshot): Snapshot<NullifierSnapshotPayload>;
     protected acceptEvent(event: NullifierEvent<string>, _blockNumber: number): boolean;
-    protected mapEvent(event: BlockchainEvent): NullifierEvent<string>;
+    protected mapEvent(event: NullifierEvent<BigNumber>): NullifierEvent<string>;
     protected getSnapshotPayload(): NullifierSnapshotPayload;
     protected populateSnapshot({ payload: { nullifiers } }: Snapshot<NullifierSnapshotPayload>): void;
 }

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

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

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

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