@hinkal/common 0.2.21 → 0.2.23

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

@@ -1,99 +1,99 @@
-import { ethers as a } from "ethers";
 import { PublicKey as T } from "@solana/web3.js";
-import { poseidonHash as E } from "../../crypto/poseidon.mjs";
+import { poseidonHash as C } from "../../crypto/poseidon.mjs";
 import { isSolanaLike as y } from "../../constants/chains.constants.mjs";
-import { Utxo as z } from "../utxo/Utxo.mjs";
-import { UserKeys as C } from "./keys.mjs";
-const x = "solana-on-chain-utxo:", f = 8, F = (o) => {
-  if (o.length !== f)
-    throw new Error(`Expected ${f} on-chain fields, received ${o.length}`);
-  const t = o.map((e, r) => {
-    const n = e instanceof Uint8Array ? e : Uint8Array.from(e);
+import { Utxo as E } from "../utxo/Utxo.mjs";
+import { UserKeys as z } from "./keys.mjs";
+import { ethers as d } from "ethers";
+const f = "solana-on-chain-utxo:", x = 8, F = (e) => {
+  if (e.length !== x)
+    throw new Error(`Expected ${x} on-chain fields, received ${e.length}`);
+  const t = e.map((o, r) => {
+    const n = o instanceof Uint8Array ? o : Uint8Array.from(o);
     if (n.length !== 32)
       throw new Error(`Expected bytes32 length 32 at position ${r}, got ${n.length}`);
     return `0x${Buffer.from(n).toString("hex")}`;
   });
-  return `${x}${a.utils.defaultAbiCoder.encode(["bytes32[8]"], [t])}`;
-}, N = (o) => o.startsWith(x), S = (o) => {
-  if (!N(o))
+  return `${f}${d.AbiCoder.defaultAbiCoder().encode(["bytes32[8]"], [t])}`;
+}, O = (e) => e.startsWith(f), B = (e) => {
+  if (!O(e))
     throw new Error("Invalid encoded Solana UTXO payload");
-  const [t] = a.utils.defaultAbiCoder.decode(
+  const [t] = d.AbiCoder.defaultAbiCoder().decode(
     ["bytes32[8]"],
-    o.slice(x.length)
-  ), e = t;
-  if (!Array.isArray(e) || e.length !== f)
+    e.slice(f.length)
+  ), o = t;
+  if (!Array.isArray(o) || o.length !== x)
     throw new Error("Malformed encoded Solana UTXO payload");
   const [
     r,
     n,
     s,
     i,
-    d,
+    a,
     c,
     m,
-    l
-  ] = e, A = BigInt(r), u = BigInt(i), h = a.BigNumber.from(d).toHexString(), g = BigInt(c), I = BigInt(m), p = BigInt(l).toString(), B = Array.from(a.utils.arrayify(n)), U = Array.from(a.utils.arrayify(s)), b = Uint8Array.from([...B.slice(16), ...U.slice(16)]), w = new T(b).toBase58(), k = E(BigInt(n), BigInt(s));
+    A
+  ] = o, l = BigInt(r), g = BigInt(i), h = d.toBeHex(BigInt(a)), u = BigInt(c), H = BigInt(m), S = BigInt(A).toString(), p = Array.from(d.getBytes(n)), U = Array.from(d.getBytes(s)), b = Uint8Array.from([...p.slice(16), ...U.slice(16)]), w = new T(b).toBase58(), k = C(BigInt(n), BigInt(s));
   return {
-    amount: A,
+    amount: l,
     erc20TokenAddress: k,
     mintAddress: w,
-    randomization: u,
+    randomization: g,
     stealthAddress: h,
-    H0: g,
-    H1: I,
-    timeStamp: p
+    H0: u,
+    H1: H,
+    timeStamp: S
   };
-}, H = (o) => {
-  const t = a.utils.defaultAbiCoder.decode(
+}, I = (e) => {
+  const t = d.AbiCoder.defaultAbiCoder().decode(
     ["uint256", "address", "tuple(uint256, uint256, uint256, uint256)", "uint256", "uint256"],
-    o
-  ), e = t[0].toBigInt(), r = t[1], n = t[2][0].toBigInt(), s = t[2][1].toHexString(), i = t[2][2].toBigInt(), d = t[2][3].toBigInt(), c = t[3].toString(), m = t[4].toNumber();
+    e
+  ), o = BigInt(t[0]), r = t[1], n = BigInt(t[2][0]), s = d.toBeHex(BigInt(t[2][1])), i = BigInt(t[2][2]), a = BigInt(t[2][3]), c = BigInt(t[3]).toString(), m = Number(t[4]);
   return {
-    amount: e,
+    amount: o,
     erc20TokenAddress: r,
     randomization: n,
     stealthAddress: s,
     H0: i,
-    H1: d,
+    H1: a,
     timeStamp: c,
     tokenId: m
   };
-}, O = (o, t, e) => {
-  if (y(e)) {
-    const { amount: m, erc20TokenAddress: l, mintAddress: A, randomization: u, stealthAddress: h, timeStamp: g } = S(o);
+}, $ = (e, t, o) => {
+  if (y(o)) {
+    const { amount: m, erc20TokenAddress: A, mintAddress: l, randomization: g, stealthAddress: h, timeStamp: u } = B(e);
     return {
       amount: m,
-      erc20TokenAddress: l,
-      mintAddress: A,
-      timeStamp: g,
+      erc20TokenAddress: A,
+      mintAddress: l,
+      timeStamp: u,
       tokenId: 0,
-      randomization: u,
+      randomization: g,
       shieldedPrivateKey: t,
       stealthAddress: h
     };
   }
-  const { amount: r, erc20TokenAddress: n, timeStamp: s, tokenId: i, randomization: d, stealthAddress: c } = H(o);
+  const { amount: r, erc20TokenAddress: n, timeStamp: s, tokenId: i, randomization: a, stealthAddress: c } = I(e);
   return {
     amount: r,
     erc20TokenAddress: n,
     timeStamp: s,
     tokenId: i,
-    randomization: d,
+    randomization: a,
     shieldedPrivateKey: t,
     stealthAddress: c
   };
-}, v = (o, t, e) => new z(O(o, t, e)), M = (o, t, e) => {
-  const { randomization: r, H0: n, H1: s } = y(e) ? S(o) : H(o), i = C.checkSignature(r, n, s, t);
+}, v = (e, t, o) => new E($(e, t, o)), M = (e, t, o) => {
+  const { randomization: r, H0: n, H1: s } = y(o) ? B(e) : I(e), i = z.checkSignature(r, n, s, t);
   if (!i)
     throw new Error("UTXO doesn't belong to user");
   return i;
 };
 export {
-  H as abiDecodeUtxo,
+  I as abiDecodeUtxo,
   M as checkUtxoSignature,
-  S as decodeSolanaOnChainUtxo,
+  B as decodeSolanaOnChainUtxo,
   v as decodeUtxo,
-  O as decodeUtxoConstructorArgs,
+  $ as decodeUtxoConstructorArgs,
   F as encodeSolanaOnChainUtxo,
-  N as isSolanaOnChainUtxo
+  O as isSolanaOnChainUtxo
 };

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

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

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

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

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@solana/web3.js"),p=require("bs58"),s=require("ethers"),P=require("ethers-v6h"),b=require("libsodium-wrappers"),d=require("../../constants/protocol.constants.cjs"),v=require("../../crypto/babyJub.cjs"),n=require("../../crypto/poseidon.cjs"),g=require("../cacheDevices/AttachableMemoryCacheDevice.cjs"),h=require("./keyUtils.cjs"),l=new g.AttachableMemoryCacheDevice,y=new g.AttachableMemoryCacheDevice,m={privateKey:"",publicKey:""};class q{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(),s.utils.verifyMessage(e,this.signature)}getShieldedPrivateKey=()=>(this.requireSignature(),s.ethers.utils.keccak256(this.signature));getShieldedPublicKey=()=>(this.requireSignature(),n.poseidonHash(this.getShieldedPrivateKey()));getDerivedEthereumAddress=()=>(this.requireSignature(),new P.ethers.Wallet(this.getShieldedPrivateKey()).address);getDerivedSolanaPublicKey=()=>(this.requireSignature(),u.Keypair.fromSeed(s.utils.arrayify(this.getShieldedPrivateKey())).publicKey.toBase58());getAccessKey=()=>(this.requireSignature(),n.poseidonHash(this.getShieldedPrivateKey(),this.getShieldedPublicKey()));getSignerPrivateKeyFromNonce=e=>{this.requireSignature();const t=n.poseidonHash(e,this.getShieldedPrivateKey(),this.getShieldedPublicKey());return s.utils.keccak256(s.utils.toUtf8Bytes(t))};getSignerSolanaPrivateKeyFromNonce=e=>{const t=this.getSignerPrivateKeyFromNonce(e),i=s.utils.arrayify(t),r=u.Keypair.fromSeed(i);return p.encode(r.secretKey)};getWalletSalt=e=>(this.requireSignature(),n.poseidonHash(this.getShieldedPublicKey(),this.getShieldedPrivateKey(),e));getInHinkalAddress=e=>{this.requireSignature();const t=n.poseidonHash(this.getShieldedPrivateKey(),e);return BigInt(t)};getBackendToken=()=>(this.requireSignature(),n.poseidonHash(this.getAccessKey(),this.getShieldedPublicKey()));static getRandomizedStealthPair=l.attach((e,t)=>{const i=v.babyJubInstance(),r=BigInt(t)%d.CIRCOM_P,c=e*r%d.CIRCOM_P,a=i.mulPointEscalar(i.Base8,e),o=i.mulPointEscalar(i.Base8,c),S=[BigInt(i.F.toString(a[0])),BigInt(i.F.toString(a[1]))],K=[BigInt(i.F.toString(o[0])),BigInt(i.F.toString(o[1]))];return{H0:S,H1:K}});static getStealthAddressCompressedPoints=(e,t)=>{const{H0:i,H1:r}=this.getRandomizedStealthPair(e,t),[c,a]=[i,r].map(o=>BigInt(o[1])+2n**255n*h.getCircomSign(o[0]));return{h0:c,h1:a}};static getStealthAddress=y.attach((e,t)=>{const{H0:i,H1:r}=this.getRandomizedStealthPair(e,t),a=[2n*h.getCircomSign(i[0])+h.getCircomSign(r[0]),i[1],r[1]];return n.poseidonHash(...a)});static getStealthAddressWithEKey=(e,t)=>({stealthAddress:this.getStealthAddress(e,t),encryptionKey:this.getEncryptionKeyPair(t).publicKey});static checkSignature=(e,t,i,r)=>{const{h0:c,h1:a}=this.getStealthAddressCompressedPoints(e,r);return t===c&&i===a};static getEncryptionKeyPair=e=>{const t=b.crypto_box_seed_keypair(s.ethers.utils.arrayify(e));return{privateKey:s.ethers.utils.hexlify(t.privateKey),publicKey:s.ethers.utils.hexlify(t.publicKey)}}}exports.EncryptionKeyPairDefaultValue=m;exports.UserKeys=q;exports.stealthAddressCacheDevice=y;exports.stealthPairCacheDevice=l;
+"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;

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

@@ -1,4 +1,6 @@
+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];
@@ -44,6 +46,14 @@ 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,18 +1,20 @@
-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 { 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 = {
   privateKey: "",
   publicKey: ""
 };
-class x {
+class l {
   signature;
   constructor(e) {
     this.signature = e;
@@ -28,76 +30,133 @@ class x {
       throw Error("No signature provided");
   }
   verifyMessage(e) {
-    return this.requireSignature(), h.verifyMessage(e, this.signature);
+    return this.requireSignature(), n.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(), n.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 n.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(n.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(), 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 n.keccak256(n.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 = n.getBytes(r), i = g.fromSeed(t);
+    return f.encode(i.secretKey);
   };
-  getWalletSalt = (e) => (this.requireSignature(), a(this.getShieldedPublicKey(), this.getShieldedPrivateKey(), e));
+  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 } });
+  };
+  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 = 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 };
     }
   );
-  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), [s, a] = [t, i].map((o) => BigInt(o[1]) + 2n ** 255n * u(o[0]));
+    return { h0: s, 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 = 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 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: s, h1: a } = this.getStealthAddressCompressedPoints(e, i);
+    return r === s && t === a;
   };
   /**
    * generate private and public keypair
@@ -105,16 +164,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 = P.crypto_box_seed_keypair(n.getBytes(e));
     return {
-      privateKey: c.utils.hexlify(t.privateKey),
-      publicKey: c.utils.hexlify(t.publicKey)
+      privateKey: n.hexlify(r.privateKey),
+      publicKey: n.hexlify(r.publicKey)
     };
   };
 }
 export {
-  D as EncryptionKeyPairDefaultValue,
-  x as UserKeys,
-  f as stealthAddressCacheDevice,
-  v as stealthPairCacheDevice
+  W as EncryptionKeyPairDefaultValue,
+  l as UserKeys,
+  B as stealthAddressCacheDevice,
+  F 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;