@hinkal/common 0.2.19 → 0.2.21

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("../../error-handling/error-codes.constants.cjs"),E=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),F=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),_=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),R=require("../../types/external-action.types.cjs"),B=require("../../types/hinkal.types.cjs"),M=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),b=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const K=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const H=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),N=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");const $=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");const O=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("../crypto-keys/keys.cjs");const G=require("../../functions/utils/time.utils.cjs"),I=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/utils/encodeTokenWithId.cjs"),z=require("../../API/unspent-utxos-calls.cjs"),V=require("../../functions/utils/addresses.cjs"),Y=require("../../functions/utils/token-check.utils.cjs"),J=async(e,t,A,d,a)=>{const s=[A.erc20TokenAddress],p=A.erc20TokenAddress,u=await W.getFeeStructure(t,p,s,R.ExternalActionId.Transact),g=d-u.flatFee;if(g<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${d}, Fee: ${u.flatFee}`);const r=[-g];b.mergeWithFeeStructure(t,s,r,u);const c={externalActionId:0n,externalAddress:a,externalActionMetadata:"0x00"},i=[...await Z.addPaddingToUtxos(e,t,s,r,void 0,void 0,!1,!0)],o=`swapperM${r.length.toString()}x${i[0].length}x1`,l=B.defaultHinkalLogicArgs(r.length,e.userKeys),f=G.getCurrentTimeInSeconds().toString(),m=[];for(let n=0;n<s.length;n+=1){const{outputUtxos:P}=E.outputUtxoProcessing(e.userKeys,i[n],r[n],f,void 0,!1);m.push(P);const{useApprovalUtxoData:T}=M.outputApprovalDataProcessing(e,t,i[n],r[n]);T&&(l.useApprovalUtxoData[n]=T,l.doPreTxApproval=!0)}const x=await e.getRandomRelay(t,!0);if(!x)throw Error(D.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:y,kycRequired:w,hasAccessToken:k}=await N.shouldPatchAccessTokenMerkleTree(e,t,s,r),h=await H.getSignatureDataForTransact(t,await e.getEthereumAddress(),e.userKeys,w,k),{zkCallData:v,circomData:U,dimData:S}=await F.constructZkProof("v1x1",e.merkleTreeHinkalByChain[t],e.merkleTreeAccessTokenByChain[t],i,m,e.userKeys,o,c.externalActionId,c.externalAddress,c.externalActionMetadata,e.generateProofRemotely,x,t,void 0,void 0,void 0,y,l,void 0,u,e.getContractWithFetcher(t,K.ContractType.HinkalHelperContract),h,void 0,!1),C=O.constructAdminData(L.AdminTransactionType.WithdrawOnChainUtxos,t,s,r,await e.getEthereumAddress());return{tx:await _.transactCallRelayer(t,v,S,U,void 0,void 0,void 0,C),amountToRecipient:g}},Q=async(e,t,A)=>{const d=[],a=Y.validateAndGetChainId([t]),s=j.encodeTokenWithId(a,{erc20TokenAddress:t.erc20TokenAddress,tokenId:0}),p=await e.getEthereumAddress(),u=V.hashEthereumAddress(p);for(;;){const q=((await I.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:a}))?.get(s)??[]).filter(o=>o.amount>0n).slice(0,6).sort((o,l)=>Number(l.amount-o.amount)),r=$.countTotalAmountInUtxos(q);if(!r)break;const c=q.map(o=>o.nullifier).filter(o=>!!o),{tx:i}=await J(e,a,t,r,A);c.length>0&&await z.deleteUnspentUtxos(a,u,c),d.push(i)}return d};exports.hinkalWithdrawStuckUtxos=Q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("../../error-handling/error-codes.constants.cjs"),E=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),B=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),_=require("../../types/external-action.types.cjs"),R=require("../../types/hinkal.types.cjs"),M=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),b=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const K=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const H=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),N=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");const $=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");const O=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("buffer");require("../crypto-keys/keys.cjs");const G=require("../../functions/utils/time.utils.cjs"),Z=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),j=require("../../functions/web3/events/getShieldedBalance.cjs"),z=require("../../functions/utils/encodeTokenWithId.cjs"),V=require("../../API/unspent-utxos-calls.cjs"),Y=require("../../functions/utils/addresses.cjs"),I=require("../../functions/utils/token-check.utils.cjs"),J=async(t,e,A,d,n)=>{const s=[A.erc20TokenAddress],g=A.erc20TokenAddress,u=await W.getFeeStructure(e,g,s,_.ExternalActionId.Transact),q=d-u.flatFee;if(q<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${d}, Fee: ${u.flatFee}`);const r=[-q];b.mergeWithFeeStructure(e,s,r,u);const i={externalActionId:0n,externalAddress:n,externalActionMetadata:"0x00"},c=[...await j.addPaddingToUtxos(t,e,s,r,void 0,void 0,!1,!0)],o=`swapperM${r.length.toString()}x${c[0].length}x1`,l=R.defaultHinkalLogicArgs(r.length,t.userKeys),y=G.getCurrentTimeInSeconds().toString(),m=[];for(let a=0;a<s.length;a+=1){const{outputUtxos:P}=E.outputUtxoProcessing(t.userKeys,c[a],r[a],y,void 0,!1);m.push(P);const{useApprovalUtxoData:T}=M.outputApprovalDataProcessing(t,e,c[a],r[a]);T&&(l.useApprovalUtxoData[a]=T,l.doPreTxApproval=!0)}const x=await t.getRandomRelay(e,!0);if(!x)throw Error(D.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:f,kycRequired:w,hasAccessToken:k}=await N.shouldPatchAccessTokenMerkleTree(t,e,s,r),h=await H.getSignatureDataForTransact(e,await t.getEthereumAddressByChain(e),t.userKeys,w,k),{zkCallData:v,circomData:U,dimData:C}=await B.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],c,m,t.userKeys,o,i.externalActionId,i.externalAddress,i.externalActionMetadata,t.generateProofRemotely,x,e,void 0,void 0,void 0,f,l,void 0,u,t.getContractWithFetcher(e,K.ContractType.HinkalHelperContract),h,void 0,!1),S=O.constructAdminData(L.AdminTransactionType.WithdrawOnChainUtxos,e,s,r,await t.getEthereumAddressByChain(e));return{tx:await F.transactCallRelayer(e,v,C,U,void 0,void 0,void 0,S),amountToRecipient:q}},Q=async(t,e,A)=>{const d=[],n=I.validateAndGetChainId([e]),s=z.encodeTokenWithId(n,{erc20TokenAddress:e.erc20TokenAddress,tokenId:0}),g=await t.getEthereumAddressByChain(n),u=Y.hashEthereumAddress(g);for(;;){const p=((await Z.getInputUtxoAndBalancePerToken({hinkal:t,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:n}))?.get(s)??[]).filter(o=>o.amount>0n).slice(0,6).sort((o,l)=>Number(l.amount-o.amount)),r=$.countTotalAmountInUtxos(p);if(!r)break;const i=p.map(o=>o.nullifier).filter(o=>!!o),{tx:c}=await J(t,n,e,r,A);i.length>0&&await V.deleteUnspentUtxos(n,u,i),d.push(c)}return d};exports.hinkalWithdrawStuckUtxos=Q;

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -1,7 +1,7 @@
 import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as R } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as F } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as B } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { outputUtxoProcessing as B } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as R } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as F } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { ExternalActionId as M } from "../../types/external-action.types.mjs";
 import { defaultHinkalLogicArgs as K } from "../../types/hinkal.types.mjs";
 import { outputApprovalDataProcessing as L } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
@@ -28,6 +28,10 @@ import "@coral-xyz/anchor";
 import "@solana/web3.js";
 import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
+import "ethers-v6h";
+import "tweetnacl";
+import "bs58";
+import "buffer";
 import "../crypto-keys/keys.mjs";
 import { getCurrentTimeInSeconds as z } from "../../functions/utils/time.utils.mjs";
 import { getInputUtxoAndBalancePerToken as G } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
@@ -35,10 +39,10 @@ import { addPaddingToUtxos as V } from "../../functions/web3/events/getShieldedB
 import { encodeTokenWithId as Y } from "../../functions/utils/encodeTokenWithId.mjs";
 import { deleteUnspentUtxos as Z } from "../../API/unspent-utxos-calls.mjs";
 import { hashEthereumAddress as j } from "../../functions/utils/addresses.mjs";
-import { validateAndGetChainId as I } from "../../functions/utils/token-check.utils.mjs";
-const J = async (t, e, d, p, n) => {
+import { validateAndGetChainId as J } from "../../functions/utils/token-check.utils.mjs";
+const Q = async (e, t, d, p, a) => {
   const s = [d.erc20TokenAddress], f = d.erc20TokenAddress, i = await W(
-    e,
+    t,
     f,
     s,
     M.Transact
@@ -46,99 +50,99 @@ const J = async (t, e, d, p, n) => {
   if (l <= 0n)
     throw new Error(`Insufficient balance to cover fee. Balance: ${p}, Fee: ${i.flatFee}`);
   const o = [-l];
-  H(e, s, o, i);
+  H(t, s, o, i);
   const m = {
     externalActionId: 0n,
-    externalAddress: n,
+    externalAddress: a,
     externalActionMetadata: "0x00"
   }, c = [
-    ...await V(t, e, s, o, void 0, void 0, !1, !0)
-  ], r = `swapperM${o.length.toString()}x${c[0].length}x1`, u = K(o.length, t.userKeys), w = z().toString(), x = [];
-  for (let a = 0; a < s.length; a += 1) {
-    const { outputUtxos: S } = R(
-      t.userKeys,
-      c[a],
-      o[a],
+    ...await V(e, t, s, o, void 0, void 0, !1, !0)
+  ], r = `swapperM${o.length.toString()}x${c[0].length}x1`, u = K(o.length, e.userKeys), w = z().toString(), x = [];
+  for (let n = 0; n < s.length; n += 1) {
+    const { outputUtxos: S } = B(
+      e.userKeys,
+      c[n],
+      o[n],
       w,
       void 0,
       !1
     );
     x.push(S);
-    const { useApprovalUtxoData: T } = L(t, e, c[a], o[a]);
-    T && (u.useApprovalUtxoData[a] = T, u.doPreTxApproval = !0);
+    const { useApprovalUtxoData: T } = L(e, t, c[n], o[n]);
+    T && (u.useApprovalUtxoData[n] = T, u.doPreTxApproval = !0);
   }
-  const g = await t.getRandomRelay(e, !0);
+  const g = await e.getRandomRelay(t, !0);
   if (!g)
     throw Error(P.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: v, kycRequired: y, hasAccessToken: U } = await O(
-    t,
+  const { patchAccessTokenMerkleTree: y, kycRequired: v, hasAccessToken: U } = await O(
     e,
+    t,
     s,
     o
-  ), k = await N(
-    e,
-    await t.getEthereumAddress(),
-    t.userKeys,
-    y,
+  ), C = await N(
+    t,
+    await e.getEthereumAddressByChain(t),
+    e.userKeys,
+    v,
     U
-  ), { zkCallData: E, circomData: h, dimData: C } = await F(
+  ), { zkCallData: k, circomData: h, dimData: E } = await R(
     "v1x1",
-    t.merkleTreeHinkalByChain[e],
-    t.merkleTreeAccessTokenByChain[e],
+    e.merkleTreeHinkalByChain[t],
+    e.merkleTreeAccessTokenByChain[t],
     c,
     x,
-    t.userKeys,
+    e.userKeys,
     r,
     m.externalActionId,
     m.externalAddress,
     m.externalActionMetadata,
-    t.generateProofRemotely,
+    e.generateProofRemotely,
     g,
-    e,
+    t,
     void 0,
     void 0,
     void 0,
-    v,
+    y,
     u,
     void 0,
     i,
-    t.getContractWithFetcher(e, $.HinkalHelperContract),
-    k,
+    e.getContractWithFetcher(t, $.HinkalHelperContract),
+    C,
     void 0,
     !1
   ), D = q(
     b.WithdrawOnChainUtxos,
-    e,
+    t,
     s,
     o,
-    await t.getEthereumAddress()
+    await e.getEthereumAddressByChain(t)
   );
-  return { tx: await B(
-    e,
+  return { tx: await F(
+    t,
+    k,
     E,
-    C,
     h,
     void 0,
     void 0,
     void 0,
     D
   ), amountToRecipient: l };
-}, Ht = async (t, e, d) => {
-  const p = [], n = I([e]), s = Y(n, { erc20TokenAddress: e.erc20TokenAddress, tokenId: 0 }), f = await t.getEthereumAddress(), i = j(f);
+}, Ot = async (e, t, d) => {
+  const p = [], a = J([t]), s = Y(a, { erc20TokenAddress: t.erc20TokenAddress, tokenId: 0 }), f = await e.getEthereumAddressByChain(a), i = j(f);
   for (; ; ) {
     const A = ((await G({
-      hinkal: t,
+      hinkal: e,
       sliceIfMore6: !1,
       useBlockedUtxos: !0,
-      chainId: n
+      chainId: a
     }))?.get(s) ?? []).filter((r) => r.amount > 0n).slice(0, 6).sort((r, u) => Number(u.amount - r.amount)), o = _(A);
     if (!o)
       break;
-    const m = A.map((r) => r.nullifier).filter((r) => !!r), { tx: c } = await J(t, n, e, o, d);
-    m.length > 0 && await Z(n, i, m), p.push(c);
+    const m = A.map((r) => r.nullifier).filter((r) => !!r), { tx: c } = await Q(e, a, t, o, d);
+    m.length > 0 && await Z(a, i, m), p.push(c);
   }
   return p;
 };
 export {
-  Ht as hinkalWithdrawStuckUtxos
+  Ot as hinkalWithdrawStuckUtxos
 };

package/data-structures/Hinkal/resetMerkleTrees.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");const m=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const F=require("../../types/balances.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../error-handling/error-codes.constants.cjs");require("../../constants/save-depths.cjs");const T=require("../event-service/evm/BlockchainEventEmitter.cjs"),P=require("../event-service/solana/SolanaBlockchainEventEmitter.cjs"),A=require("@solana/web3.js");require("../crypto-keys/keys.cjs");const k=require("../../functions/web3/events/balanceChangedCustomHandler.cjs"),f=require("../snapshot/SnapshotFetcherService.cjs"),x=require("../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs"),M=require("../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs"),b=require("../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.cjs"),_=require("../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.cjs"),L=require("../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs"),N=require("../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs"),O=require("../snapshot/evm-snapshots/ClientApprovalsSnapshotService.cjs"),R=require("../../functions/utils/create-provider.cjs"),w=require("../../functions/utils/mutexes.utils.cjs"),U=async(t,E)=>{const h=E??u.WALLET_SUPPORTED_CHAINS;h.forEach(e=>{t.commitmentsSnapshotServiceByChain[e]?.intervalClear(),t.nullifierSnapshotServiceByChain[e]?.intervalClear(),t.accessTokenSnapshotServiceByChain[e]?.intervalClear(),t.approvalsSnapshotServiceByChain[e]?.intervalClear()});const g=h.map(async e=>{const{maxPageSize:a,fetchRpcUrl:y,contractData:B}=u.networkRegistry[e];let r,c;if(u.isSolanaLike(e)){const n=B.hinkalAddress;if(!y||!n)throw new Error("Fetch RPC URL or Solana program ID is not set");const C=R.createCustomSolanaConnection(y),i=new A.PublicKey(n),s=w.getChainBalanceFetchingMutex(e);r=new P.SolanaBlockchainEventEmitter(e,C,i,0,!1,s,a);const q=B.hinkalIdl;q&&r.setIdl(q);const v=new f.SnapshotFetcherService(e,n);t.commitmentsSnapshotServiceByChain[e]=new x.ClientSolanaCommitmentsSnapshotService(r,v),t.nullifierSnapshotServiceByChain[e]=new M.ClientSolanaNullifierSnapshotService(r,v),t.accessTokenSnapshotServiceByChain[e]=new b.ClientSolanaAccessTokenSnapshotService(r,v),t.approvalsSnapshotServiceByChain[e]=void 0}else{const n=t.getContractWithFetcherByChainId(e,m.ContractType.HinkalContract),C=t.getContractWithFetcherByChainId(e,m.ContractType.DepositOnChainUtxos),i=w.getChainBalanceFetchingMutex(e);r=new T.BlockchainEventEmitter(e,n,0,!1,i,a,C),c=new T.BlockchainEventEmitter(e,t.getContractWithFetcherByChainId(e,m.ContractType.AccessTokenContract),0,!1,i,a);const s=new f.SnapshotFetcherService(e,n.address);t.commitmentsSnapshotServiceByChain[e]=new L.ClientCommitmentsSnapshotService(r,s),t.nullifierSnapshotServiceByChain[e]=new N.ClientNullifierSnapshotService(r,s),t.accessTokenSnapshotServiceByChain[e]=new _.ClientAccessTokenSnapshotService(c,s),t.approvalsSnapshotServiceByChain[e]=new O.ClientApprovalsSnapshotService(r,s)}const o=t.commitmentsSnapshotServiceByChain[e],l=t.nullifierSnapshotServiceByChain[e],S=t.accessTokenSnapshotServiceByChain[e],p=t.approvalsSnapshotServiceByChain[e];if(!o||!l||!S)throw new Error(`Missing snapshot service for chain ${e}`);await Promise.all([o.init(),l.init(),S.init(),p?.init()]),await Promise.all([r.init(),c?.init()]),t.merkleTreeHinkalByChain[e]=o.merkleTree,t.merkleTreeAccessTokenByChain[e]=S.merkleTree,t.nullifiersByChain[e]=l.nullifiers,t.encryptedOutputsByChain[e]=o.encryptedOutputs,p&&(t.approvalsByChain[e]=p.approvals),r.onEventsProcessed=n=>{n>0&&k.balanceChangedCustomHandler({updateType:F.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0})}});await Promise.allSettled(g)};exports.resetMerkleTrees=U;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const q=require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const P=require("../../types/balances.types.cjs"),T=require("../../types/events.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../error-handling/error-codes.constants.cjs");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");const w=require("../event-service/evm/ClientBlockchainEventEmitter.cjs");require("@coral-xyz/anchor");const M=require("../event-service/solana/ClientSolanaBlockchainEventEmitter.cjs"),k=require("@solana/web3.js");require("../crypto-keys/keys.cjs");const A=require("../../functions/web3/events/balanceChangedCustomHandler.cjs"),f=require("../snapshot/SnapshotFetcherService.cjs"),x=require("../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs"),b=require("../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs"),_=require("../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.cjs"),N=require("../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.cjs"),O=require("../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs"),R=require("../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs"),U=require("../snapshot/evm-snapshots/ClientApprovalsSnapshotService.cjs"),H=require("../../functions/utils/create-provider.cjs"),g=require("../../functions/utils/mutexes.utils.cjs"),L=async(t,E)=>{const m=E??t.getSupportedChains();m.forEach(e=>{t.commitmentsSnapshotServiceByChain[e]?.intervalClear(),t.nullifierSnapshotServiceByChain[e]?.intervalClear(),t.accessTokenSnapshotServiceByChain[e]?.intervalClear(),t.approvalsSnapshotServiceByChain[e]?.intervalClear()});const F=m.map(async e=>{const{maxPageSize:a,fetchRpcUrl:h,contractData:y}=q.networkRegistry[e];let r,c;if(q.isSolanaLike(e)){const n=y.hinkalAddress;if(!h||!n)throw new Error("Fetch RPC URL or Solana program ID is not set");const C=H.createCustomSolanaConnection(h),i=new k.PublicKey(n),s=g.getChainBalanceFetchingMutex(e);r=new M.ClientSolanaBlockchainEventEmitter(e,C,i,0,s,a);const B=y.hinkalIdl;B&&r.setIdl(B);const v=new f.SnapshotFetcherService(e,n);t.commitmentsSnapshotServiceByChain[e]=new x.ClientSolanaCommitmentsSnapshotService(r,v),t.nullifierSnapshotServiceByChain[e]=new b.ClientSolanaNullifierSnapshotService(r,v),t.accessTokenSnapshotServiceByChain[e]=new _.ClientSolanaAccessTokenSnapshotService(r,v),t.approvalsSnapshotServiceByChain[e]=void 0}else{const n=t.getContractWithFetcherByChainId(e,u.ContractType.HinkalContract),C=t.getContractWithFetcherByChainId(e,u.ContractType.DepositOnChainUtxos),i=g.getChainBalanceFetchingMutex(e);r=new w.ClientBlockchainEventEmitter(T.EventCategory.MainContractEvents,e,n,0,i,a,C),c=new w.ClientBlockchainEventEmitter(T.EventCategory.MainContractEvents,e,t.getContractWithFetcherByChainId(e,u.ContractType.AccessTokenContract),0,i,a);const s=new f.SnapshotFetcherService(e,n.address);t.commitmentsSnapshotServiceByChain[e]=new O.ClientCommitmentsSnapshotService(r,s),t.nullifierSnapshotServiceByChain[e]=new R.ClientNullifierSnapshotService(r,s),t.accessTokenSnapshotServiceByChain[e]=new N.ClientAccessTokenSnapshotService(c,s),t.approvalsSnapshotServiceByChain[e]=new U.ClientApprovalsSnapshotService(r,s)}const o=t.commitmentsSnapshotServiceByChain[e],l=t.nullifierSnapshotServiceByChain[e],S=t.accessTokenSnapshotServiceByChain[e],p=t.approvalsSnapshotServiceByChain[e];if(!o||!l||!S)throw new Error(`Missing snapshot service for chain ${e}`);await Promise.all([o.init(),l.init(),S.init(),p?.init()]),await Promise.all([r.init(),c?.init()]),t.merkleTreeHinkalByChain[e]=o.merkleTree,t.merkleTreeAccessTokenByChain[e]=S.merkleTree,t.nullifiersByChain[e]=l.nullifiers,t.encryptedOutputsByChain[e]=o.encryptedOutputs,p&&(t.approvalsByChain[e]=p.approvals),r.onEventsProcessed=n=>{n>0&&A.balanceChangedCustomHandler({updateType:P.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0})}});await Promise.allSettled(F)};exports.resetMerkleTrees=L;

package/data-structures/Hinkal/resetMerkleTrees.mjs

@@ -1,9 +1,10 @@
-import { networkRegistry as P, isSolanaLike as F, WALLET_SUPPORTED_CHAINS as A } from "../../constants/chains.constants.mjs";
+import { networkRegistry as P, isSolanaLike as x } from "../../constants/chains.constants.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as v } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import { PrivateBalanceUpdateType as x } from "../../types/balances.types.mjs";
+import { PrivateBalanceUpdateType as M } from "../../types/balances.types.mjs";
+import { EventCategory as u } from "../../types/events.types.mjs";
 import "ethers";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
@@ -12,47 +13,48 @@ import "buffer";
 import "../../constants/vite.constants.mjs";
 import "../../error-handling/error-codes.constants.mjs";
 import "../../constants/save-depths.mjs";
-import { BlockchainEventEmitter as u } from "../event-service/evm/BlockchainEventEmitter.mjs";
-import { SolanaBlockchainEventEmitter as L } from "../event-service/solana/SolanaBlockchainEventEmitter.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import { ClientBlockchainEventEmitter as w } from "../event-service/evm/ClientBlockchainEventEmitter.mjs";
+import "@coral-xyz/anchor";
+import { ClientSolanaBlockchainEventEmitter as A } from "../event-service/solana/ClientSolanaBlockchainEventEmitter.mjs";
 import { PublicKey as R } from "@solana/web3.js";
 import "../crypto-keys/keys.mjs";
 import { balanceChangedCustomHandler as U } from "../../functions/web3/events/balanceChangedCustomHandler.mjs";
 import { SnapshotFetcherService as T } from "../snapshot/SnapshotFetcherService.mjs";
-import { ClientSolanaCommitmentsSnapshotService as M } from "../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.mjs";
+import { ClientSolanaCommitmentsSnapshotService as L } from "../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.mjs";
 import { ClientSolanaNullifierSnapshotService as O } from "../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.mjs";
 import { ClientSolanaAccessTokenSnapshotService as W } from "../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.mjs";
 import { ClientAccessTokenSnapshotService as D } from "../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.mjs";
 import { ClientCommitmentsSnapshotService as H } from "../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.mjs";
-import { ClientNullifierSnapshotService as k } from "../snapshot/evm-snapshots/ClientNullifierSnapshotService.mjs";
-import { ClientApprovalsSnapshotService as N } from "../snapshot/evm-snapshots/ClientApprovalsSnapshotService.mjs";
-import { createCustomSolanaConnection as b } from "../../functions/utils/create-provider.mjs";
-import { getChainBalanceFetchingMutex as w } from "../../functions/utils/mutexes.utils.mjs";
-const ve = async (t, g) => {
-  const f = g ?? A;
+import { ClientNullifierSnapshotService as b } from "../snapshot/evm-snapshots/ClientNullifierSnapshotService.mjs";
+import { ClientApprovalsSnapshotService as k } from "../snapshot/evm-snapshots/ClientApprovalsSnapshotService.mjs";
+import { createCustomSolanaConnection as K } from "../../functions/utils/create-provider.mjs";
+import { getChainBalanceFetchingMutex as g } from "../../functions/utils/mutexes.utils.mjs";
+const Be = async (t, E) => {
+  const f = E ?? t.getSupportedChains();
   f.forEach((e) => {
     t.commitmentsSnapshotServiceByChain[e]?.intervalClear(), t.nullifierSnapshotServiceByChain[e]?.intervalClear(), t.accessTokenSnapshotServiceByChain[e]?.intervalClear(), t.approvalsSnapshotServiceByChain[e]?.intervalClear();
   });
-  const E = f.map(async (e) => {
+  const F = f.map(async (e) => {
     const { maxPageSize: a, fetchRpcUrl: y, contractData: B } = P[e];
     let o, p;
-    if (F(e)) {
+    if (x(e)) {
       const r = B.hinkalAddress;
       if (!y || !r)
         throw new Error("Fetch RPC URL or Solana program ID is not set");
-      const l = b(y), i = new R(r), n = w(e);
-      o = new L(
+      const l = K(y), s = new R(r), n = g(e);
+      o = new A(
         e,
         l,
-        i,
+        s,
         0,
-        !1,
         n,
         a
       );
       const h = B.hinkalIdl;
       h && o.setIdl(h);
       const C = new T(e, r);
-      t.commitmentsSnapshotServiceByChain[e] = new M(
+      t.commitmentsSnapshotServiceByChain[e] = new L(
         o,
         C
       ), t.nullifierSnapshotServiceByChain[e] = new O(
@@ -66,55 +68,55 @@ const ve = async (t, g) => {
       const r = t.getContractWithFetcherByChainId(e, v.HinkalContract), l = t.getContractWithFetcherByChainId(
         e,
         v.DepositOnChainUtxos
-      ), i = w(e);
-      o = new u(
+      ), s = g(e);
+      o = new w(
+        u.MainContractEvents,
         e,
         r,
         0,
-        !1,
-        i,
+        s,
         a,
         l
-      ), p = new u(
+      ), p = new w(
+        u.MainContractEvents,
         e,
         t.getContractWithFetcherByChainId(e, v.AccessTokenContract),
         0,
-        !1,
-        i,
+        s,
         a
       );
       const n = new T(e, r.address);
       t.commitmentsSnapshotServiceByChain[e] = new H(
         o,
         n
-      ), t.nullifierSnapshotServiceByChain[e] = new k(
+      ), t.nullifierSnapshotServiceByChain[e] = new b(
         o,
         n
       ), t.accessTokenSnapshotServiceByChain[e] = new D(
         p,
         n
-      ), t.approvalsSnapshotServiceByChain[e] = new N(
+      ), t.approvalsSnapshotServiceByChain[e] = new k(
         o,
         n
       );
     }
-    const s = t.commitmentsSnapshotServiceByChain[e], m = t.nullifierSnapshotServiceByChain[e], c = t.accessTokenSnapshotServiceByChain[e], S = t.approvalsSnapshotServiceByChain[e];
-    if (!s || !m || !c)
+    const i = t.commitmentsSnapshotServiceByChain[e], m = t.nullifierSnapshotServiceByChain[e], c = t.accessTokenSnapshotServiceByChain[e], S = t.approvalsSnapshotServiceByChain[e];
+    if (!i || !m || !c)
       throw new Error(`Missing snapshot service for chain ${e}`);
     await Promise.all([
-      s.init(),
+      i.init(),
       m.init(),
       c.init(),
       S?.init()
-    ]), await Promise.all([o.init(), p?.init()]), t.merkleTreeHinkalByChain[e] = s.merkleTree, t.merkleTreeAccessTokenByChain[e] = c.merkleTree, t.nullifiersByChain[e] = m.nullifiers, t.encryptedOutputsByChain[e] = s.encryptedOutputs, S && (t.approvalsByChain[e] = S.approvals), o.onEventsProcessed = (r) => {
+    ]), await Promise.all([o.init(), p?.init()]), t.merkleTreeHinkalByChain[e] = i.merkleTree, t.merkleTreeAccessTokenByChain[e] = c.merkleTree, t.nullifiersByChain[e] = m.nullifiers, t.encryptedOutputsByChain[e] = i.encryptedOutputs, S && (t.approvalsByChain[e] = S.approvals), o.onEventsProcessed = (r) => {
       r > 0 && U({
-        updateType: x.FreshWithoutLoader,
+        updateType: M.FreshWithoutLoader,
         updateTokensListBefore: !0
       });
     };
   });
-  await Promise.allSettled(E);
+  await Promise.allSettled(F);
 };
 export {
-  ve as resetMerkleTrees
+  Be as resetMerkleTrees
 };

package/data-structures/IndexedDB/activity-db.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("idb-keyval"),m=require("ethers");require("../../types/circom-data.types.cjs");const I=require("../../constants/protocol.constants.cjs");require("../../types/transactions.types.cjs");const y=require("../../types/activities.types.cjs"),d=require("../../types/cache.types.cjs");require("../../constants/token-data/index.cjs");const k=require("../../constants/chains.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");const P=require("../../functions/utils/amounts.utils.cjs");require("circomlibjs-hinkal-fork");require("../http/HttpClient.cjs");const b=require("../../error-handling/logger.cjs"),_=require("../../functions/utils/erc20tokenFunctions.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");const N=require("../../functions/web3/etherFunctions.cjs");require("../crypto-keys/keys.cjs");require("../../error-handling/error-codes.constants.cjs");require("../../API/getServerURL.cjs");require("axios");require("@solana/spl-token");require("../../functions/utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");const C=require("../../API/API.cjs");require("async-mutex");require("../../API/tenderly.api.cjs");require("process");require("buffer");require("../../providers/EthersProviderAdapter.cjs");require("node-forge");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../functions/web3/getTokenHolder.cjs");require("ethers-v6h");class B{generateTxId(){const e=new Date().getTime(),t=Math.random().toString(36).substring(2,15);return`tx_${e}_${t}`}async getTransactionRecord(){return await g.get(d.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(e){const{from:t,to:r,gas:a,gasPrice:n,gasInDollar:s,value:o,chainId:u,status:i,txHash:q,activityType:c,tokensReceive:l,tokensSpend:p,tokensApprove:h,ownerPublicAddress:A,activityIcon:S,dappUrl:w,dappName:x,integrationProvider:D}=e,T=this.generateTxId(),f={id:T,from:t,to:r,gas:a,gasPrice:n,gasInDollar:s?.toString(),value:o,chainId:u,txHash:q,activityType:c,status:i??y.ActivityStatus.PENDING,timestamp:new Date,tokensReceive:l,tokensSpend:p,tokensApprove:h,ownerPublicAddress:A,activityIcon:S,dappUrl:w,dappName:x,integrationProvider:D};return await g.update(d.StorageKeys.TX_ACTIVITY,(v={})=>(v[T]=f,v)),T}async getTxRequest(e){return(await this.getTransactionRecord())[e]||null}async getAllTxRequests(e){const t=await this.getTransactionRecord();return Object.values(t).filter(r=>r.chainId===e).sort((r,a)=>new Date(a.timestamp).getTime()-new Date(r.timestamp).getTime())}async updateTxStatusAndHash(e,t,r,a,n,s,o,u){const i=await this.getTxRequest(e);if(!i)throw new Error("Transaction not found");const q=await this.getGasInDollar(o,u,i.chainId),c={...i,status:t,txHash:r,value:i.value??a,from:i.from??n,to:i.to??s,gas:o,gasPrice:u,gasInDollar:i.gasInDollar??q?.toString(),timestamp:new Date};return await g.update(d.StorageKeys.TX_ACTIVITY,(l={})=>(l[e]=c,l)),c}async updateActivity(e,t,r,a,n,s,o,u){try{await this.updateTxStatusAndHash(e,t,r,a,n,s,o,u)}catch(i){console.log("error in updating tx request",i)}}async removePendingTransactions(e){try{await g.update(d.StorageKeys.TX_ACTIVITY,(t={})=>(delete t[e],t))}catch(t){console.log("error in deleting tx requests",t)}}async updatePendingTransactions(e,t){try{if(!e.success){await this.updateActivity(t,y.ActivityStatus.FAILED,"erroredTx"in e?e.erroredTx?.transactionHash:void 0);return}if("tx"in e){const{tx:r}=e;await this.updateActivity(t,y.ActivityStatus.SUCCESSFUL,r.hash,m.BigNumber.from(r.value??0n).toHexString(),r.from,r.to,m.BigNumber.from(r.gas??0n),m.BigNumber.from(r.gasPrice??0n))}}catch(r){console.log("error in updating pending transactions",r)}}getGasInDollar=async(e,t,r)=>{if(!(!e||!t))try{const a=k.isSolanaLike(r)?I.solanaNativeAddress:I.zeroAddress,n=_.getERC20Token(a,r);if(!n)return;const{prices:s}=await C.API.getTokenPrices(r,[n.erc20TokenAddress]),o=s[0];if(!o)return;const i=o*Number(N.getAmountInToken(n,t.toBigInt()))*Number(e.toBigInt());return P.fixDecimalsAmount(i)}catch(a){b.Logger.error("Failed to calculate gas cost in dollars:",{chainId:r,error:a});return}}}const E=new B;exports.activityStorage=E;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("idb-keyval"),y=require("ethers");require("../../types/circom-data.types.cjs");const p=require("../../constants/protocol.constants.cjs");require("../../types/transactions.types.cjs");const m=require("../../types/activities.types.cjs"),g=require("../../types/cache.types.cjs");require("../../constants/token-data/index.cjs");const _=require("../../constants/chains.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");const b=require("../../functions/utils/amounts.utils.cjs");require("circomlibjs-hinkal-fork");require("../http/HttpClient.cjs");const N=require("../../error-handling/logger.cjs"),C=require("../../functions/utils/erc20tokenFunctions.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");const F=require("../../functions/web3/etherFunctions.cjs");require("../crypto-keys/keys.cjs");require("../../error-handling/error-codes.constants.cjs");require("../../API/getServerURL.cjs");require("axios");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("buffer");require("../../functions/utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");const H=require("../../API/API.cjs");require("async-mutex");require("process");require("../../providers/EthersProviderAdapter.cjs");require("../../functions/web3/events/getInputUtxoAndBalance.cjs");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../functions/web3/getTokenHolder.cjs");require("node-forge");class E{generateTxId(){const e=new Date().getTime(),r=Math.random().toString(36).substring(2,15);return`tx_${e}_${r}`}async getTransactionRecord(){return await c.get(g.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(e){const{from:r,to:t,gas:i,gasPrice:n,gasInDollar:s,extraNativeTokenFee:o,value:u,chainId:a,status:q,txHash:l,activityType:d,tokensReceive:h,tokensSpend:I,tokensApprove:A,ownerPublicAddress:w,activityIcon:S,dappUrl:x,dappName:f,integrationProvider:D,knownPartialSignature:k}=e,T=this.generateTxId(),P={id:T,from:r,to:t,gas:i,gasPrice:n,gasInDollar:s?.toString(),extraNativeTokenFee:o?.toString(),value:u,chainId:a,txHash:l,activityType:d,status:q??m.ActivityStatus.PENDING,timestamp:new Date,tokensReceive:h,tokensSpend:I,tokensApprove:A,ownerPublicAddress:w,activityIcon:S,dappUrl:x,dappName:f,integrationProvider:D,knownPartialSignature:k};return await c.update(g.StorageKeys.TX_ACTIVITY,(v={})=>(v[T]=P,v)),T}async getTxRequest(e){return(await this.getTransactionRecord())[e]||null}async getAllTxRequests(e){const r=await this.getTransactionRecord();return Object.values(r).filter(t=>t.chainId===e).sort((t,i)=>new Date(i.timestamp).getTime()-new Date(t.timestamp).getTime())}async updateTxHash(e,r){const t=await this.getTxRequest(e);if(!t)throw new Error("Activity not found");const i={...t,txHash:r};await c.update(g.StorageKeys.TX_ACTIVITY,(n={})=>(n[e]=i,n))}async updateTxStatusAndHash(e,r,t,i,n,s,o,u){const a=await this.getTxRequest(e);if(!a)throw new Error("Transaction not found");const q=await this.getGasInDollar(o,u,a.chainId),l={...a,status:r,txHash:t,value:a.value??i,from:a.from??n,to:a.to??s,gas:o,gasPrice:u,gasInDollar:a.gasInDollar??q?.toString(),timestamp:new Date};return await c.update(g.StorageKeys.TX_ACTIVITY,(d={})=>(d[e]=l,d)),l}async updateActivity(e,r,t,i,n,s,o,u){try{await this.updateTxStatusAndHash(e,r,t,i,n,s,o,u)}catch(a){console.log("error in updating tx request",a)}}async removePendingTransactions(e){try{await c.update(g.StorageKeys.TX_ACTIVITY,(r={})=>(delete r[e],r))}catch(r){console.log("error in deleting tx requests",r)}}async updatePendingTransactions(e,r){try{if(!e.success){await this.updateActivity(r,m.ActivityStatus.FAILED,"erroredTx"in e?e.erroredTx?.transactionHash:void 0);return}if("tx"in e){const{tx:t}=e;await this.updateActivity(r,m.ActivityStatus.SUCCESSFUL,t.hash,y.BigNumber.from(t.value??0n).toHexString(),t.from,t.to,y.BigNumber.from(t.gas??0n),y.BigNumber.from(t.gasPrice??0n))}}catch(t){console.log("error in updating pending transactions",t)}}getGasInDollar=async(e,r,t)=>{if(!(!e||!r))try{const i=_.isSolanaLike(t)?p.solanaNativeAddress:p.zeroAddress,n=C.getERC20Token(i,t);if(!n)return;const{prices:s}=await H.API.getTokenPrices(t,[n.erc20TokenAddress]),o=s[0];if(!o)return;const a=o*Number(F.getAmountInToken(n,r.toBigInt()))*Number(e.toBigInt());return b.fixDecimalsAmount(a)}catch(i){N.Logger.error("Failed to calculate gas cost in dollars:",{chainId:t,error:i});return}}}const K=new E;exports.activityStorage=K;

package/data-structures/IndexedDB/activity-db.d.ts

@@ -5,6 +5,7 @@ declare class ActivityStorage {
     saveTxRequest(txRequest: ActivityAddRequest): Promise<string>;
     getTxRequest(id: string): Promise<Activity>;
     getAllTxRequests(chainId: number): Promise<Activity[]>;
+    updateTxHash(activityId: string, newTxHash: string): Promise<void>;
     private updateTxStatusAndHash;
     private updateActivity;
     removePendingTransactions(pendingActivityId: string): Promise<void>;