@hinkal/common 0.2.26 → 0.2.28

package/data-structures/crypto-keys/encryptDecryptUtxo.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),a=require("libsodium-wrappers"),l=require("../utxo/Utxo.cjs"),m=require("@solana/web3.js"),B=require("./keys.cjs"),g=e=>{const r=[Buffer.from(o.ethers.toBeHex(e.amount)),Buffer.from(e.erc20TokenAddress),Buffer.from(o.ethers.toBeHex(e.randomization)),Buffer.from(e.getStealthAddress()),Buffer.from(o.ethers.toBeHex(BigInt(e.timeStamp))),Buffer.from(o.ethers.toBeHex(e.tokenId??0))];if(e.mintAddress){const t=new m.PublicKey(e.mintAddress).toBytes();r.push(Buffer.from(t))}const n=Buffer.concat(r);return a.crypto_box_seal(n,o.ethers.getBytes(e.getEncryptionKey()))},p=(e,r)=>{const{publicKey:n,privateKey:c}=B.UserKeys.getEncryptionKeyPair(r.getShieldedPrivateKey()),d=a.crypto_box_seal_open(e,o.ethers.getBytes(n),o.ethers.getBytes(c)),t=Buffer.from(d).toString("utf-8").split("0x").filter(s=>s.length!==0).map((s,y)=>{let i;return[0,2,4,5].includes(y)?i=BigInt(`0x${s}`):[1,3,6].includes(y)&&(i=`0x${s}`),i}),f=typeof t[6]=="string"?t[6]:void 0,u=f?new m.PublicKey(Buffer.from(f.slice(2),"hex")).toString():void 0;return{amount:t[0],erc20TokenAddress:t[1],randomization:t[2],stealthAddress:t[3],shieldedPrivateKey:r.getShieldedPrivateKey(),timeStamp:t[4].toString(),tokenId:t[5]?Number(t[5]):0,mintAddress:u}},h=(e,r)=>new l.Utxo(p(e,r));exports.decryptUtxo=h;exports.decryptUtxoConstructorArgs=p;exports.encryptUtxo=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("ethers"),m=require("libsodium-wrappers"),B=require("../utxo/Utxo.cjs"),p=require("@solana/web3.js"),g=require("./keys.cjs"),a=e=>e.startsWith("0x")?e:`0x${e}`,h=e=>{const s=[Buffer.from(r.ethers.toBeHex(e.amount)),Buffer.from(a(e.erc20TokenAddress)),Buffer.from(r.ethers.toBeHex(e.randomization)),Buffer.from(a(e.getStealthAddress())),Buffer.from(r.ethers.toBeHex(BigInt(e.timeStamp))),Buffer.from(r.ethers.toBeHex(BigInt(e.tokenId??0)))];if(e.mintAddress){const i=new p.PublicKey(e.mintAddress),t=r.ethers.hexlify(i.toBytes());s.push(Buffer.from(t))}const n=Buffer.concat(s);return m.crypto_box_seal(n,r.ethers.getBytes(e.getEncryptionKey()))},u=(e,s)=>{const{publicKey:n,privateKey:f}=g.UserKeys.getEncryptionKeyPair(s.getShieldedPrivateKey()),i=m.crypto_box_seal_open(e,r.ethers.getBytes(n),r.ethers.getBytes(f)),t=Buffer.from(i).toString("utf-8").split("0x").filter(o=>o.length!==0).map((o,y)=>{let c;return[0,2,4,5].includes(y)?c=BigInt(`0x${o}`):[1,3,6].includes(y)&&(c=`0x${o}`),c}),d=typeof t[6]=="string"?t[6]:void 0,l=d?new p.PublicKey(Buffer.from(d.slice(2),"hex")).toString():void 0;return{amount:t[0],erc20TokenAddress:t[1],randomization:t[2],stealthAddress:t[3],shieldedPrivateKey:s.getShieldedPrivateKey(),timeStamp:t[4].toString(),tokenId:t[5]?Number(t[5]):0,mintAddress:l}},x=(e,s)=>new B.Utxo(u(e,s));exports.decryptUtxo=x;exports.decryptUtxoConstructorArgs=u;exports.encryptUtxo=h;

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

@@ -1,47 +1,46 @@
-import { ethers as o } from "ethers";
-import a from "libsodium-wrappers";
-import { Utxo as B } from "../utxo/Utxo.mjs";
+import { ethers as r } from "ethers";
+import y from "libsodium-wrappers";
+import { Utxo as g } from "../utxo/Utxo.mjs";
 import { PublicKey as p } from "@solana/web3.js";
 import { UserKeys as l } from "./keys.mjs";
-const K = (e) => {
-  const r = [
-    Buffer.from(o.toBeHex(e.amount)),
-    Buffer.from(e.erc20TokenAddress),
-    // if it is zeroAddress toBeHex will return 0x00
-    Buffer.from(o.toBeHex(e.randomization)),
-    Buffer.from(e.getStealthAddress()),
-    Buffer.from(o.toBeHex(BigInt(e.timeStamp))),
-    Buffer.from(o.toBeHex(e.tokenId ?? 0))
+const a = (e) => e.startsWith("0x") ? e : `0x${e}`, S = (e) => {
+  const o = [
+    Buffer.from(r.toBeHex(e.amount)),
+    Buffer.from(a(e.erc20TokenAddress)),
+    Buffer.from(r.toBeHex(e.randomization)),
+    Buffer.from(a(e.getStealthAddress())),
+    Buffer.from(r.toBeHex(BigInt(e.timeStamp))),
+    Buffer.from(r.toBeHex(BigInt(e.tokenId ?? 0)))
   ];
   if (e.mintAddress) {
-    const t = new p(e.mintAddress).toBytes();
-    r.push(Buffer.from(t));
+    const i = new p(e.mintAddress), t = r.hexlify(i.toBytes());
+    o.push(Buffer.from(t));
   }
-  const s = Buffer.concat(r);
-  return a.crypto_box_seal(s, o.getBytes(e.getEncryptionKey()));
-}, g = (e, r) => {
-  const { publicKey: s, privateKey: f } = l.getEncryptionKeyPair(r.getShieldedPrivateKey()), d = a.crypto_box_seal_open(
+  const s = Buffer.concat(o);
+  return y.crypto_box_seal(s, r.getBytes(e.getEncryptionKey()));
+}, u = (e, o) => {
+  const { publicKey: s, privateKey: c } = l.getEncryptionKeyPair(o.getShieldedPrivateKey()), i = y.crypto_box_seal_open(
     e,
-    o.getBytes(s),
-    o.getBytes(f)
-  ), t = Buffer.from(d).toString("utf-8").split("0x").filter((n) => n.length !== 0).map((n, c) => {
-    let i;
-    return [0, 2, 4, 5].includes(c) ? i = BigInt(`0x${n}`) : [1, 3, 6].includes(c) && (i = `0x${n}`), i;
-  }), m = typeof t[6] == "string" ? t[6] : void 0, y = m ? new p(Buffer.from(m.slice(2), "hex")).toString() : void 0;
+    r.getBytes(s),
+    r.getBytes(c)
+  ), t = Buffer.from(i).toString("utf-8").split("0x").filter((n) => n.length !== 0).map((n, m) => {
+    let f;
+    return [0, 2, 4, 5].includes(m) ? f = BigInt(`0x${n}`) : [1, 3, 6].includes(m) && (f = `0x${n}`), f;
+  }), d = typeof t[6] == "string" ? t[6] : void 0, B = d ? new p(Buffer.from(d.slice(2), "hex")).toString() : void 0;
   return {
     amount: t[0],
     erc20TokenAddress: t[1],
     randomization: t[2],
     stealthAddress: t[3],
-    shieldedPrivateKey: r.getShieldedPrivateKey(),
+    shieldedPrivateKey: o.getShieldedPrivateKey(),
     timeStamp: t[4].toString(),
     tokenId: t[5] ? Number(t[5]) : 0,
     // tokenId
-    mintAddress: y
+    mintAddress: B
   };
-}, S = (e, r) => new B(g(e, r));
+}, H = (e, o) => new g(u(e, o));
 export {
-  S as decryptUtxo,
-  g as decryptUtxoConstructorArgs,
-  K as encryptUtxo
+  H as decryptUtxo,
+  u as decryptUtxoConstructorArgs,
+  S as encryptUtxo
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("ethers"),w=require("libsodium-wrappers"),S=require("../../constants/protocol.constants.cjs"),f=require("../../crypto/babyJub.cjs"),h=require("../../crypto/poseidon.cjs"),d=require("./keyUtils.cjs"),K=require("../cacheDevices/AttachableMemoryCacheDevice.cjs"),l=require("../../constants/chains.constants.cjs"),c=require("@solana/web3.js"),m=require("tweetnacl"),p=require("bs58"),b=require("../../functions/utils/create-provider.cjs"),v=new K.AttachableMemoryCacheDevice,P=new K.AttachableMemoryCacheDevice,q={privateKey:"",publicKey:""};class g{signature;constructor(e){this.signature=e}getSignature(){return this.requireSignature(),this.signature}setSignature(e){this.signature=e}requireSignature(){if(!this.signature)throw Error("No signature provided")}verifyMessage(e){return this.requireSignature(),n.ethers.verifyMessage(e,this.signature)}getShieldedPrivateKey=()=>(this.requireSignature(),n.ethers.keccak256(this.signature));getShieldedPublicKey=()=>(this.requireSignature(),h.poseidonHash(this.getShieldedPrivateKey()));getDerivedEthereumAddress=()=>(this.requireSignature(),new n.ethers.Wallet(this.getShieldedPrivateKey()).address);getDerivedSolanaPublicKey=()=>(this.requireSignature(),c.Keypair.fromSeed(n.ethers.getBytes(this.getShieldedPrivateKey())).publicKey.toBase58());getAccessKey=()=>(this.requireSignature(),h.poseidonHash(this.getShieldedPrivateKey(),this.getShieldedPublicKey()));getSignerPrivateKeyFromNonce=e=>{this.requireSignature();const r=h.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return n.ethers.keccak256(n.ethers.toUtf8Bytes(r))};getSignerSolanaPrivateKeyFromNonce=e=>{const r=this.getSignerPrivateKeyFromNonce(e),t=n.ethers.getBytes(r),i=c.Keypair.fromSeed(t);return p.encode(i.secretKey)};getEvmPrivateKeyFromSolanaPrivateKey=e=>{const t=p.decode(e).slice(0,32);return n.ethers.hexlify(t)};static getSignerFromPrivateKey=(e,r)=>{if(l.isSolanaLike(e)){const i=n.ethers.getBytes(r);return c.Keypair.fromSeed(i)}return new n.ethers.Wallet(r)};static getSignerAddressFromPrivateKey(e,r){const t=g.getSignerFromPrivateKey(e,r);return t instanceof c.Keypair?t.publicKey.toString():t.address}static signMessageFromPrivateKey=async(e,r,t)=>{const i=g.getSignerFromPrivateKey(e,r);if(i instanceof c.Keypair){const a=n.ethers.isHexString(t)?n.ethers.getBytes(t):new TextEncoder().encode(t),o=m.sign.detached(a,i.secretKey);return`0x${Buffer.from(o).toString("hex")}`}const s=n.ethers.isHexString(t)?n.ethers.getBytes(t):t;return i.signMessage(s)};static signSolanaTransactionFromPrivateKey=(e,r,t)=>{if(!l.isSolanaLike(e))throw new Error("Solana transaction signing is only available for Solana chains");const i=g.getSignerFromPrivateKey(e,r);if(!(i instanceof c.Keypair))throw new Error("Unable to derive Solana keypair for signing");t.sign([i])};static sendAndSignTransactionFromPrivateKey=async(e,r,t)=>{const i=g.getSignerFromPrivateKey(e,r),{fetchRpcUrl:s}=l.networkRegistry[e];if(!s)throw new Error("No RPC URL found for chainId");if(i instanceof c.Keypair){if(!(t instanceof c.VersionedTransaction))throw new Error("Invalid transaction type for Solana");return t.sign([i]),await b.createCustomSolanaConnection(s).sendRawTransaction(t.serialize())}if(t instanceof c.VersionedTransaction)throw new Error("Invalid transaction type for EVM");const a=new n.ethers.JsonRpcProvider(s);return(await i.connect(a).sendTransaction(t)).hash};static signTypedDataFromPrivateKey=async(e,r,t,i,s)=>{if(l.isSolanaLike(e))throw new Error("Solana does not support typed data");return await g.getSignerFromPrivateKey(e,r).signTypedData(t,i,s)};static authorizeDelegation=async(e,r,t,i)=>{if(l.isSolanaLike(e))throw new Error("Solana does not support delegation");const s=new n.ethers.JsonRpcProvider(l.networkRegistry[e].fetchRpcUrl);return await g.getSignerFromPrivateKey(e,r).connect(s).authorize({address:t,...i!==void 0&&{nonce:i}})};getWalletSalt=e=>(this.requireSignature(),h.poseidonHash(this.getShieldedPublicKey(),this.getShieldedPrivateKey(),e));getInHinkalAddress=e=>{this.requireSignature();const r=h.poseidonHash(this.getShieldedPrivateKey(),e);return BigInt(r)};getBackendToken=()=>(this.requireSignature(),h.poseidonHash(this.getAccessKey(),this.getShieldedPublicKey()));static getRandomizedStealthPair=v.attach((e,r)=>{const t=f.babyJubInstance(),i=BigInt(r)%S.CIRCOM_P,s=e*i%S.CIRCOM_P,a=t.mulPointEscalar(t.Base8,e),o=t.mulPointEscalar(t.Base8,s),u=[BigInt(t.F.toString(a[0])),BigInt(t.F.toString(a[1]))],y=[BigInt(t.F.toString(o[0])),BigInt(t.F.toString(o[1]))];return{H0:u,H1:y}});static getStealthAddressCompressedPoints=(e,r)=>{const{H0:t,H1:i}=this.getRandomizedStealthPair(e,r),[s,a]=[t,i].map(o=>BigInt(o[1])+2n**255n*d.getCircomSign(o[0]));return{h0:s,h1:a}};static getStealthAddress=P.attach((e,r)=>{const{H0:t,H1:i}=this.getRandomizedStealthPair(e,r),a=[2n*d.getCircomSign(t[0])+d.getCircomSign(i[0]),t[1],i[1]];return h.poseidonHash(...a)});static getStealthAddressWithEKey=(e,r)=>({stealthAddress:this.getStealthAddress(e,r),encryptionKey:this.getEncryptionKeyPair(r).publicKey});static checkSignature=(e,r,t,i)=>{const{h0:s,h1:a}=this.getStealthAddressCompressedPoints(e,i);return r===s&&t===a};static getEncryptionKeyPair=e=>{const r=w.crypto_box_seed_keypair(n.ethers.getBytes(e));return{privateKey:n.ethers.hexlify(r.privateKey),publicKey:n.ethers.hexlify(r.publicKey)}}}exports.EncryptionKeyPairDefaultValue=q;exports.UserKeys=g;exports.stealthAddressCacheDevice=P;exports.stealthPairCacheDevice=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("@solana/web3.js"),P=require("bs58"),r=require("ethers"),p=require("libsodium-wrappers"),l=require("../../constants/protocol.constants.cjs"),v=require("../../crypto/babyJub.cjs"),n=require("../../crypto/poseidon.cjs"),y=require("../cacheDevices/AttachableMemoryCacheDevice.cjs"),c=require("./keyUtils.cjs"),u=new y.AttachableMemoryCacheDevice,g=new y.AttachableMemoryCacheDevice,b={privateKey:"",publicKey:""};class m{signature;shieldedPrivateKey;constructor(e,t){this.signature=e,this.shieldedPrivateKey=t}getSignature(){return this.requireSignature(),this.signature}setSignature(e){this.signature=e}requireSignature(){if(!this.signature)throw Error("No signature provided")}requireKeyMaterial(){if(!this.signature&&!this.shieldedPrivateKey)throw Error("No signature or shielded private key provided")}verifyMessage(e){return this.requireSignature(),r.ethers.verifyMessage(e,this.signature)}getShieldedPrivateKey=()=>(this.requireKeyMaterial(),this.shieldedPrivateKey||(this.shieldedPrivateKey=r.ethers.keccak256(this.signature)),this.shieldedPrivateKey);getShieldedPublicKey=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getShieldedPrivateKey()));getShieldedPrivateKeyFromNonce=e=>{this.requireKeyMaterial();const t="hinkal-offchain-shielded-key",i=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return r.ethers.keccak256(r.ethers.toUtf8Bytes(`${t}:${i}`))};getDerivedEthereumAddress=()=>(this.requireKeyMaterial(),new r.ethers.Wallet(this.getShieldedPrivateKey()).address);getDerivedSolanaPublicKey=()=>(this.requireKeyMaterial(),d.Keypair.fromSeed(r.ethers.getBytes(this.getShieldedPrivateKey())).publicKey.toBase58());getAccessKey=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getShieldedPrivateKey(),this.getShieldedPublicKey()));getSignerPrivateKeyFromNonce=e=>{this.requireKeyMaterial();const t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return r.ethers.keccak256(r.ethers.toUtf8Bytes(t))};getSignerSolanaPrivateKeyFromNonce=e=>{const t=this.getSignerPrivateKeyFromNonce(e),i=r.ethers.getBytes(t),s=d.Keypair.fromSeed(i);return P.encode(s.secretKey)};getWalletSalt=e=>(this.requireKeyMaterial(),n.poseidonHash(this.getShieldedPublicKey(),this.getShieldedPrivateKey(),e));getInHinkalAddress=e=>{this.requireKeyMaterial();const t=n.poseidonHash(this.getShieldedPrivateKey(),e);return BigInt(t)};getBackendToken=()=>(this.requireKeyMaterial(),n.poseidonHash(this.getAccessKey(),this.getShieldedPublicKey()));static getRandomizedStealthPair=u.attach((e,t)=>{const i=v.babyJubInstance(),s=BigInt(t)%l.CIRCOM_P,h=e*s%l.CIRCOM_P,a=i.mulPointEscalar(i.Base8,e),o=i.mulPointEscalar(i.Base8,h),K=[BigInt(i.F.toString(a[0])),BigInt(i.F.toString(a[1]))],S=[BigInt(i.F.toString(o[0])),BigInt(i.F.toString(o[1]))];return{H0:K,H1:S}});static getStealthAddressCompressedPoints=(e,t)=>{const{H0:i,H1:s}=this.getRandomizedStealthPair(e,t),[h,a]=[i,s].map(o=>BigInt(o[1])+2n**255n*c.getCircomSign(o[0]));return{h0:h,h1:a}};static getStealthAddress=g.attach((e,t)=>{const{H0:i,H1:s}=this.getRandomizedStealthPair(e,t),a=[2n*c.getCircomSign(i[0])+c.getCircomSign(s[0]),i[1],s[1]];return n.poseidonHash(...a)});static getStealthAddressWithEKey=(e,t)=>({stealthAddress:this.getStealthAddress(e,t),encryptionKey:this.getEncryptionKeyPair(t).publicKey});static checkSignature=(e,t,i,s)=>{const{h0:h,h1:a}=this.getStealthAddressCompressedPoints(e,s);return t===h&&i===a};static getEncryptionKeyPair=e=>{const t=p.crypto_box_seed_keypair(r.ethers.getBytes(e));return{privateKey:r.ethers.hexlify(t.privateKey),publicKey:r.ethers.hexlify(t.publicKey)}}}exports.EncryptionKeyPairDefaultValue=b;exports.UserKeys=m;exports.stealthAddressCacheDevice=g;exports.stealthPairCacheDevice=u;

package/data-structures/crypto-keys/keys.d.ts

@@ -1,6 +1,4 @@
-import { ethers } from 'ethers';
 import { AttachableMemoryCacheDevice } from '../cacheDevices/AttachableMemoryCacheDevice';
-import { VersionedTransaction } from '@solana/web3.js';
 export declare const stealthPairCacheDevice: AttachableMemoryCacheDevice<{
     H0: [bigint, bigint];
     H1: [bigint, bigint];
@@ -13,10 +11,12 @@ export interface EncryptionKeyPair {
 export declare const EncryptionKeyPairDefaultValue: EncryptionKeyPair;
 export declare class UserKeys {
     private signature;
-    constructor(_signature?: string);
+    private shieldedPrivateKey;
+    constructor(_signature?: string, _shieldedPrivateKey?: string);
     getSignature(): string;
     setSignature(_signature: string): void;
     private requireSignature;
+    private requireKeyMaterial;
     verifyMessage(signingMessage: string): string;
     /**
      * get shielded private key from message signature used to login to the application,
@@ -31,6 +31,12 @@ export declare class UserKeys {
      * @retuns shielded public key in hexstring with 0x prefixed
      */
     getShieldedPublicKey: () => string;
+    /**
+     * Currently used for creating shielded private keys for deposit UTXOs, which are encrypted and sent to enclave for private send
+     * @param nonce Used to deterministically generate new shielded private key
+     * @returns new shielded private key in hexstring with 0x prefixed
+     */
+    getShieldedPrivateKeyFromNonce: (nonce: bigint) => string;
     /**
      * deterministically derive an EVM address from the shielded private key
      */
@@ -46,14 +52,6 @@ export declare class UserKeys {
     getAccessKey: () => string;
     getSignerPrivateKeyFromNonce: (walletNonce: bigint) => string;
     getSignerSolanaPrivateKeyFromNonce: (walletNonce: bigint) => string;
-    getEvmPrivateKeyFromSolanaPrivateKey: (solanaPrivateKey: string) => string;
-    private static getSignerFromPrivateKey;
-    static getSignerAddressFromPrivateKey(chainId: number, privateKey: string): string;
-    static signMessageFromPrivateKey: (chainId: number, privateKey: string, message: string) => Promise<string>;
-    static signSolanaTransactionFromPrivateKey: (chainId: number, privateKey: string, transaction: VersionedTransaction) => void;
-    static sendAndSignTransactionFromPrivateKey: (chainId: number, privateKey: string, transaction: ethers.TransactionRequest | VersionedTransaction) => Promise<string>;
-    static signTypedDataFromPrivateKey: (chainId: number, privateKey: string, domain: ethers.TypedDataDomain, types: Record<string, Array<ethers.TypedDataField>>, value: Record<string, any>) => Promise<string>;
-    static authorizeDelegation: (chainId: number, privateKey: string, implementation: string, nonce?: number) => Promise<ethers.Authorization>;
     getWalletSalt: (walletNonce: bigint) => string;
     /**
      * generate inHinkalAddress - a user unique address linking him with a specific app

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

@@ -1,23 +1,21 @@
-import { ethers as n } from "ethers";
-import P from "libsodium-wrappers";
-import { CIRCOM_P as S } from "../../constants/protocol.constants.mjs";
-import { babyJubInstance as v } from "../../crypto/babyJub.mjs";
-import { poseidonHash as c } from "../../crypto/poseidon.mjs";
-import { getCircomSign as u } from "./keyUtils.mjs";
-import { AttachableMemoryCacheDevice as K } from "../cacheDevices/AttachableMemoryCacheDevice.mjs";
-import { isSolanaLike as d, networkRegistry as p } from "../../constants/chains.constants.mjs";
-import { Keypair as g, VersionedTransaction as m } from "@solana/web3.js";
-import w from "tweetnacl";
-import f from "bs58";
-import { createCustomSolanaConnection as b } from "../../functions/utils/create-provider.mjs";
-const F = new K(), B = new K(), W = {
+import { Keypair as c } from "@solana/web3.js";
+import K from "bs58";
+import { ethers as r } from "ethers";
+import S from "libsodium-wrappers";
+import { CIRCOM_P as l } from "../../constants/protocol.constants.mjs";
+import { babyJubInstance as P } from "../../crypto/babyJub.mjs";
+import { poseidonHash as n } from "../../crypto/poseidon.mjs";
+import { AttachableMemoryCacheDevice as y } from "../cacheDevices/AttachableMemoryCacheDevice.mjs";
+import { getCircomSign as o } from "./keyUtils.mjs";
+const m = new y(), p = new y(), H = {
   privateKey: "",
   publicKey: ""
 };
-class l {
+class C {
   signature;
-  constructor(e) {
-    this.signature = e;
+  shieldedPrivateKey;
+  constructor(e, t) {
+    this.signature = e, this.shieldedPrivateKey = t;
   }
   getSignature() {
     return this.requireSignature(), this.signature;
@@ -29,134 +27,91 @@ class l {
     if (!this.signature)
       throw Error("No signature provided");
   }
+  requireKeyMaterial() {
+    if (!this.signature && !this.shieldedPrivateKey)
+      throw Error("No signature or shielded private key provided");
+  }
   verifyMessage(e) {
-    return this.requireSignature(), n.verifyMessage(e, this.signature);
+    return this.requireSignature(), r.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(), n.keccak256(this.signature));
+  getShieldedPrivateKey = () => (this.requireKeyMaterial(), this.shieldedPrivateKey || (this.shieldedPrivateKey = r.keccak256(this.signature)), this.shieldedPrivateKey);
   /**
    * 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(), c(this.getShieldedPrivateKey()));
+  getShieldedPublicKey = () => (this.requireKeyMaterial(), n(this.getShieldedPrivateKey()));
+  /**
+   * Currently used for creating shielded private keys for deposit UTXOs, which are encrypted and sent to enclave for private send
+   * @param nonce Used to deterministically generate new shielded private key
+   * @returns new shielded private key in hexstring with 0x prefixed
+   */
+  getShieldedPrivateKeyFromNonce = (e) => {
+    this.requireKeyMaterial();
+    const t = "hinkal-offchain-shielded-key", i = n(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
+    return r.keccak256(r.toUtf8Bytes(`${t}:${i}`));
+  };
   /**
    * deterministically derive an EVM address from the shielded private key
    */
-  getDerivedEthereumAddress = () => (this.requireSignature(), new n.Wallet(this.getShieldedPrivateKey()).address);
+  getDerivedEthereumAddress = () => (this.requireKeyMaterial(), new r.Wallet(this.getShieldedPrivateKey()).address);
   /**
    * deterministically derive a Solana public key from the shielded private key
    */
-  getDerivedSolanaPublicKey = () => (this.requireSignature(), g.fromSeed(n.getBytes(this.getShieldedPrivateKey())).publicKey.toBase58());
+  getDerivedSolanaPublicKey = () => (this.requireKeyMaterial(), c.fromSeed(r.getBytes(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(), c(this.getShieldedPrivateKey(), this.getShieldedPublicKey()));
+  getAccessKey = () => (this.requireKeyMaterial(), n(this.getShieldedPrivateKey(), this.getShieldedPublicKey()));
   getSignerPrivateKeyFromNonce = (e) => {
-    this.requireSignature();
-    const r = c(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
-    return n.keccak256(n.toUtf8Bytes(r));
+    this.requireKeyMaterial();
+    const t = n(e, this.getShieldedPrivateKey(), this.getShieldedPublicKey());
+    return r.keccak256(r.toUtf8Bytes(t));
   };
   getSignerSolanaPrivateKeyFromNonce = (e) => {
-    const r = this.getSignerPrivateKeyFromNonce(e), t = n.getBytes(r), i = g.fromSeed(t);
-    return f.encode(i.secretKey);
-  };
-  getEvmPrivateKeyFromSolanaPrivateKey = (e) => {
-    const t = f.decode(e).slice(0, 32);
-    return n.hexlify(t);
-  };
-  static getSignerFromPrivateKey = (e, r) => {
-    if (d(e)) {
-      const i = n.getBytes(r);
-      return g.fromSeed(i);
-    }
-    return new n.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 = n.isHexString(t) ? n.getBytes(t) : new TextEncoder().encode(t), o = w.sign.detached(a, i.secretKey);
-      return `0x${Buffer.from(o).toString("hex")}`;
-    }
-    const s = n.isHexString(t) ? n.getBytes(t) : t;
-    return i.signMessage(s);
-  };
-  static signSolanaTransactionFromPrivateKey = (e, r, t) => {
-    if (!d(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: s } = p[e];
-    if (!s)
-      throw new Error("No RPC URL found for chainId");
-    if (i instanceof g) {
-      if (!(t instanceof m))
-        throw new Error("Invalid transaction type for Solana");
-      return t.sign([i]), await b(s).sendRawTransaction(t.serialize());
-    }
-    if (t instanceof m)
-      throw new Error("Invalid transaction type for EVM");
-    const a = new n.JsonRpcProvider(s);
-    return (await i.connect(a).sendTransaction(t)).hash;
-  };
-  static signTypedDataFromPrivateKey = async (e, r, t, i, s) => {
-    if (d(e))
-      throw new Error("Solana does not support typed data");
-    return await l.getSignerFromPrivateKey(e, r).signTypedData(t, i, s);
-  };
-  static authorizeDelegation = async (e, r, t, i) => {
-    if (d(e))
-      throw new Error("Solana does not support delegation");
-    const s = new n.JsonRpcProvider(p[e].fetchRpcUrl);
-    return await l.getSignerFromPrivateKey(e, r).connect(s).authorize({ address: t, ...i !== void 0 && { nonce: i } });
+    const t = this.getSignerPrivateKeyFromNonce(e), i = r.getBytes(t), s = c.fromSeed(i);
+    return K.encode(s.secretKey);
   };
-  getWalletSalt = (e) => (this.requireSignature(), c(this.getShieldedPublicKey(), this.getShieldedPrivateKey(), e));
+  getWalletSalt = (e) => (this.requireKeyMaterial(), n(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 r = c(this.getShieldedPrivateKey(), e);
-    return BigInt(r);
+    this.requireKeyMaterial();
+    const t = n(this.getShieldedPrivateKey(), e);
+    return BigInt(t);
   };
   /**
    * generate backend token, which is used for access control on backend
    * @returns accessKey in hexstring with 0x prefixed
    */
-  getBackendToken = () => (this.requireSignature(), c(this.getAccessKey(), this.getShieldedPublicKey()));
-  static getRandomizedStealthPair = F.attach(
-    (e, r) => {
-      const t = v(), i = BigInt(r) % S, s = e * i % S, a = t.mulPointEscalar(t.Base8, e), o = t.mulPointEscalar(t.Base8, s), h = [BigInt(t.F.toString(a[0])), BigInt(t.F.toString(a[1]))], y = [BigInt(t.F.toString(o[0])), BigInt(t.F.toString(o[1]))];
-      return { H0: h, H1: y };
+  getBackendToken = () => (this.requireKeyMaterial(), n(this.getAccessKey(), this.getShieldedPublicKey()));
+  static getRandomizedStealthPair = m.attach(
+    (e, t) => {
+      const i = P(), s = BigInt(t) % l, h = e * s % l, a = i.mulPointEscalar(i.Base8, e), d = i.mulPointEscalar(i.Base8, h), g = [BigInt(i.F.toString(a[0])), BigInt(i.F.toString(a[1]))], u = [BigInt(i.F.toString(d[0])), BigInt(i.F.toString(d[1]))];
+      return { H0: g, H1: u };
     }
   );
-  static getStealthAddressCompressedPoints = (e, r) => {
-    const { H0: t, H1: i } = this.getRandomizedStealthPair(e, r), [s, a] = [t, i].map((o) => BigInt(o[1]) + 2n ** 255n * u(o[0]));
-    return { h0: s, h1: a };
+  static getStealthAddressCompressedPoints = (e, t) => {
+    const { H0: i, H1: s } = this.getRandomizedStealthPair(e, t), [h, a] = [i, s].map((d) => BigInt(d[1]) + 2n ** 255n * o(d[0]));
+    return { h0: h, h1: a };
   };
-  static getStealthAddress = B.attach((e, r) => {
-    const { H0: t, H1: i } = this.getRandomizedStealthPair(e, r), a = [2n * u(t[0]) + u(i[0]), t[1], i[1]];
-    return c(...a);
+  static getStealthAddress = p.attach((e, t) => {
+    const { H0: i, H1: s } = this.getRandomizedStealthPair(e, t), a = [2n * o(i[0]) + o(s[0]), i[1], s[1]];
+    return n(...a);
   });
-  static getStealthAddressWithEKey = (e, r) => ({ stealthAddress: this.getStealthAddress(e, r), encryptionKey: this.getEncryptionKeyPair(r).publicKey });
-  static checkSignature = (e, r, t, i) => {
-    const { h0: s, h1: a } = this.getStealthAddressCompressedPoints(e, i);
-    return r === s && t === a;
+  static getStealthAddressWithEKey = (e, t) => ({ stealthAddress: this.getStealthAddress(e, t), encryptionKey: this.getEncryptionKeyPair(t).publicKey });
+  static checkSignature = (e, t, i, s) => {
+    const { h0: h, h1: a } = this.getStealthAddressCompressedPoints(e, s);
+    return t === h && i === a;
   };
   /**
    * generate private and public keypair
@@ -164,16 +119,16 @@ class l {
    * and must correspond to 32 bytes
    */
   static getEncryptionKeyPair = (e) => {
-    const r = P.crypto_box_seed_keypair(n.getBytes(e));
+    const t = S.crypto_box_seed_keypair(r.getBytes(e));
     return {
-      privateKey: n.hexlify(r.privateKey),
-      publicKey: n.hexlify(r.publicKey)
+      privateKey: r.hexlify(t.privateKey),
+      publicKey: r.hexlify(t.publicKey)
     };
   };
 }
 export {
-  W as EncryptionKeyPairDefaultValue,
-  l as UserKeys,
-  B as stealthAddressCacheDevice,
-  F as stealthPairCacheDevice
+  H as EncryptionKeyPairDefaultValue,
+  C as UserKeys,
+  p as stealthAddressCacheDevice,
+  m 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"),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;
+"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;

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

@@ -2,6 +2,7 @@ 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;
@@ -17,7 +18,7 @@ export type AccessTokenSerializedSnapshot = {
     senderAddresses?: string[];
     senderAddressIndexMap?: SenderAddressIndexMapJson;
 };
-export declare abstract class AbstractAccessTokenSnapshotService extends AbstractSnapshotService<AccessTokenEvent<bigint>, AccessTokenEvent, AccessTokenSnapshotPayload, AccessTokenSerializedSnapshot> {
+export declare abstract class AbstractAccessTokenSnapshotService extends AbstractSnapshotService<AccessTokenEvent<bigint>, AccessTokenSnapshotPayload, AccessTokenSerializedSnapshot> {
     constructor(accessTokenEventFetcher: BlockchainEventEmitter);
     private _merkleTree;
     private _senderAddresses;
@@ -28,7 +29,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: AccessTokenEvent): AccessTokenEvent<bigint>;
+    protected mapEvent(event: BlockchainEvent): 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 m } from "../../../constants/protocol.constants.mjs";
-import { poseidonFunction as o } from "../../../crypto/poseidon.mjs";
+import { zeroAddress as o } from "../../../constants/protocol.constants.mjs";
+import { poseidonFunction as m } 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 l } from "./AbstractSnapshotService.mjs";
-import { contructMerkleTreeFromSerialized as A } from "../../../functions/utils/merkleTree.utils.mjs";
-class b extends l {
+import { AbstractSnapshotService as A } from "./AbstractSnapshotService.mjs";
+import { contructMerkleTreeFromSerialized as c } from "../../../functions/utils/merkleTree.utils.mjs";
+class g extends A {
   constructor(e) {
     super(e, "NewAccessKeyAdded");
   }
@@ -39,7 +39,7 @@ class b extends l {
   }
   deserializeSnapshot(e) {
     let s, r;
-    return e.latestBlockNumber && e.merkleTree ? s = A(e.merkleTree) : s = a.create(o, 0n), e.latestBlockNumber && e.senderAddressIndexMap ? r = new Map(
+    return e.latestBlockNumber && e.merkleTree ? s = c(e.merkleTree) : s = a.create(m, 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 b extends l {
       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 === m && this._merkleTree.remove(e.index), !0;
+      ), this._senderAddresses.includes(e.senderAddress) || this._senderAddresses.push(e.senderAddress), e.accessKey === 0n && e.senderAddress === o && this._merkleTree.remove(e.index), !0;
     } catch (r) {
       return console.error(r), !1;
     }
   }
   mapEvent(e) {
-    const { accessKey: s, index: r, senderAddress: d } = e;
+    const s = e.getArg("accessKey"), r = e.getArg("index"), d = e.getArg("senderAddress");
     return {
       accessKey: t(s),
       index: t(r),
@@ -82,5 +82,5 @@ class b extends l {
   }
 }
 export {
-  b as AbstractAccessTokenSnapshotService
+  g as AbstractAccessTokenSnapshotService
 };

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

@@ -1 +1 @@
-"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;
+"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;

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

@@ -2,6 +2,7 @@ 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>;
@@ -11,7 +12,7 @@ export type ApprovalsSerializedSnapshot = {
     approvals: Record<string, ApprovedUtxo<string>[]>;
     events: string[];
 };
-export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, NewApprovedUtxoEvent<string>, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
+export declare abstract class AbstractApprovalsSnapshotService extends AbstractSnapshotService<NewApprovedUtxoEvent, ApprovalsSnapshotPayload, ApprovalsSerializedSnapshot> {
     constructor(hinkalEventEmitter: BlockchainEventEmitter);
     private _approvals;
     events: Set<string>;
@@ -24,6 +25,6 @@ export declare abstract class AbstractApprovalsSnapshotService extends AbstractS
         events: Set<string>;
     };
     protected populateSnapshot({ payload: { approvals, events } }: Snapshot<ApprovalsSnapshotPayload>): void;
-    protected mapEvent(event: NewApprovedUtxoEvent<string>): NewApprovedUtxoEvent;
+    protected mapEvent(event: BlockchainEvent): 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 u } from "../../../functions/utils/caseInsensitive.utils.mjs";
-class g extends c {
+import { caseInsensitiveEqual as A } from "../../../functions/utils/caseInsensitive.utils.mjs";
+class f extends c {
   constructor(e) {
     super(e, "NewApprovedUtxo");
   }
@@ -57,7 +57,7 @@ class g extends c {
     this._approvals = e, this.events = t;
   }
   mapEvent(e) {
-    const { approveTo: t, tokenAddress: s, amount: r, inHinkalAddress: p } = e;
+    const t = e.getArg("approveTo"), s = e.getArg("tokenAddress"), r = e.getArg("amount"), p = e.getArg("inHinkalAddress");
     return {
       approveTo: t,
       tokenAddress: s,
@@ -75,7 +75,7 @@ class g extends c {
       };
       let a = this.approvals.get(e.approveTo) || [], d = !1;
       for (let o = 0; o < a.length; o += 1)
-        u(i, a[o].tokenAddress) && l === a[o].inHinkalAddress && (a[o].amount += p, d = !0);
+        A(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 g extends c {
   }
 }
 export {
-  g as AbstractApprovalsSnapshotService
+  f as AbstractApprovalsSnapshotService
 };

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

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=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 m=require("../../../functions/utils/amounts.utils.cjs"),y=require("./AbstractSnapshotService.cjs"),a=require("../../../functions/utils/merkleTree.utils.cjs");class O extends y.AbstractSnapshotService{constructor(e){super(e,"NewCommitment")}_merkleTree;_encryptedOutputs;_encryptedOutputsByCommitment=new Map;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})),encryptedOutputsByCommitment:Array.from(e.payload.encryptedOutputsByCommitment.entries()).map(([t,r])=>({commitment:t.toString(),encryptedOutput:r}))}}deserializeSnapshot(e){let t;e.latestBlockNumber&&e.merkleTree?t=a.contructMerkleTreeFromSerialized(e.merkleTree):t=l.MerkleTree.create(d.poseidonFunction,0n);const r=e.encryptedOutputs?.map(u=>({value:u.value,isPositive:JSON.parse(u.isPositive),isBlocked:u.isBlocked??!1})),n=new Map;return e.encryptedOutputsByCommitment?.forEach(({commitment:u,encryptedOutput:i})=>{n.set(m.toBigInt(u),i)}),{latestBlockNumber:e.latestBlockNumber??0,payload:{merkleTree:t,encryptedOutputs:r||[],encryptedOutputsByCommitment:n}}}getSnapshotPayload(){return{merkleTree:this._merkleTree,encryptedOutputs:this._encryptedOutputs,encryptedOutputsByCommitment:this._encryptedOutputsByCommitment}}populateSnapshot({payload:{merkleTree:e,encryptedOutputs:t,encryptedOutputsByCommitment:r}}){this._merkleTree=e,this._encryptedOutputs=t,this._encryptedOutputsByCommitment=r}mapEvent(e){const t=e.getArg("commitment"),r=e.getArg("index"),n=e.getArg("encryptedOutput");return{commitment:m.toBigInt(t),index:m.toBigInt(r),encryptedOutput:n}}acceptEvent(e,t,r,n){const u=e.index>=0n?e.index:-1n*e.index,i=this._merkleTree.getValue(u);if(i===e.commitment)return!1;this._merkleTree.insert(e.commitment,u);const c=i!==void 0?this._encryptedOutputsByCommitment.get(i):void 0;if(i!==void 0&&c!==void 0){const s=this.encryptedOutputs.findIndex(o=>o.value===c);s!==-1&&this.encryptedOutputs.splice(s,1),this._encryptedOutputsByCommitment.delete(i)}if(this._encryptedOutputsByCommitment.set(e.commitment,e.encryptedOutput),this.encryptedOutputs.map(s=>s.value).includes(e.encryptedOutput))return!0;const p={value:e.encryptedOutput,isPositive:e.index>=0n,isBlocked:n??!1};return this._encryptedOutputs.push(p),!0}}exports.AbstractCommitmentsSnapshotService=O;