@hinkal/common 0.2.18 → 0.2.20

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -1,148 +1,148 @@
-import { transactionErrorCodes as S } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as P } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as B } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { constructZkProof as R } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as k } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as F } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as M } from "../../types/hinkal.types.mjs";
-import { outputApprovalDataProcessing as K } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { getFeeStructure as L } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as W } from "../../functions/pre-transaction/merge-with-fee-structure.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";
+import { getFeeStructure as W } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as H } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as B } from "../../types/ethereum-network.types.mjs";
+import { ContractType as $ } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import { AdminTransactionType as H } from "../../types/admin.types.mjs";
+import { AdminTransactionType as b } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
-import { getSignatureDataForTransact as $ } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as b } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as N } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as O } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import "../../constants/server.constants.mjs";
-import "../../constants/chains.constants.mjs";
-import "../../constants/vite.constants.mjs";
+import "../../API/getServerURL.mjs";
 import "../http/HttpClient.mjs";
 import "axios";
-import { countTotalAmountInUtxos as N } from "../../functions/utils/amounts.utils.mjs";
+import "../../constants/vite.constants.mjs";
+import { countTotalAmountInUtxos as _ } from "../../functions/utils/amounts.utils.mjs";
 import "ethers";
 import "../../constants/token-data/index.mjs";
-import "../../API/getServerURL.mjs";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../../functions/utils/mutexes.utils.mjs";
+import "../../constants/chains.constants.mjs";
+import { constructAdminData as q } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@coral-xyz/anchor";
 import "@solana/web3.js";
-import "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as O } from "../../functions/utils/time.utils.mjs";
-import { constructAdminData as _ } from "../../functions/pre-transaction/constructAdminData.mjs";
+import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
-import { getInputUtxoAndBalancePerToken as q } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
-import { addPaddingToUtxos as z } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { encodeTokenWithId as V } from "../../functions/utils/encodeTokenWithId.mjs";
-import { deleteUnspentUtxos as Y } from "../../API/unspent-utxos-calls.mjs";
-import { hashEthereumAddress as Z } from "../../functions/utils/addresses.mjs";
-const j = async (t, m, d, u) => {
-  const o = [m.erc20TokenAddress], p = m.erc20TokenAddress, a = await L(
-    t.getCurrentChainId(),
-    p,
-    o,
-    F.Transact
-  ), c = d - a.flatFee;
-  if (c <= 0n)
-    throw new Error(`Insufficient balance to cover fee. Balance: ${d}, Fee: ${a.flatFee}`);
-  const e = [-c];
-  W(t.getCurrentChainId(), o, e, a);
-  const i = {
+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";
+import { addPaddingToUtxos as V } from "../../functions/web3/events/getShieldedBalance.mjs";
+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 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(
+    t,
+    f,
+    s,
+    M.Transact
+  ), l = p - i.flatFee;
+  if (l <= 0n)
+    throw new Error(`Insufficient balance to cover fee. Balance: ${p}, Fee: ${i.flatFee}`);
+  const o = [-l];
+  H(t, s, o, i);
+  const m = {
     externalActionId: 0n,
-    externalAddress: u,
+    externalAddress: a,
     externalActionMetadata: "0x00"
-  }, s = [
-    ...await z(t, o, e, void 0, void 0, !1, !0)
-  ], f = `swapperM${e.length.toString()}x${s[0].length}x1`, r = M(e.length, t.userKeys), l = O().toString(), A = [];
-  for (let n = 0; n < o.length; n += 1) {
-    const { outputUtxos: D } = P(
-      t.userKeys,
-      s[n],
-      e[n],
-      l,
+  }, c = [
+    ...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
     );
-    A.push(D);
-    const { useApprovalUtxoData: x } = K(t, s[n], e[n]);
-    x && (r.useApprovalUtxoData[n] = x, r.doPreTxApproval = !0);
+    x.push(S);
+    const { useApprovalUtxoData: T } = L(e, t, c[n], o[n]);
+    T && (u.useApprovalUtxoData[n] = T, u.doPreTxApproval = !0);
   }
-  const g = await t.getRandomRelay(!0);
+  const g = await e.getRandomRelay(t, !0);
   if (!g)
-    throw Error(S.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: w, kycRequired: C, hasAccessToken: h } = await b(
+    throw Error(P.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: y, kycRequired: v, hasAccessToken: U } = await O(
+    e,
     t,
-    o,
-    e
-  ), v = await $(
-    t.getCurrentChainId(),
-    await t.getEthereumAddress(),
-    t.userKeys,
-    C,
-    h
-  ), { zkCallData: I, circomData: y, dimData: U } = await R(
-    "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
     s,
-    A,
-    t.userKeys,
-    f,
-    i.externalActionId,
-    i.externalAddress,
-    i.externalActionMetadata,
-    t.generateProofRemotely,
+    o
+  ), C = await N(
+    t,
+    await e.getEthereumAddressByChain(t),
+    e.userKeys,
+    v,
+    U
+  ), { zkCallData: k, circomData: h, dimData: E } = await R(
+    "v1x1",
+    e.merkleTreeHinkalByChain[t],
+    e.merkleTreeAccessTokenByChain[t],
+    c,
+    x,
+    e.userKeys,
+    r,
+    m.externalActionId,
+    m.externalAddress,
+    m.externalActionMetadata,
+    e.generateProofRemotely,
     g,
-    t.getCurrentChainId(),
-    void 0,
+    t,
     void 0,
     void 0,
     void 0,
-    w,
-    r,
+    y,
+    u,
     void 0,
-    a,
-    t.getContractWithFetcher(B.HinkalHelperContract),
-    v,
+    i,
+    e.getContractWithFetcher(t, $.HinkalHelperContract),
+    C,
     void 0,
     !1
-  ), E = _(
-    H.WithdrawOnChainUtxos,
-    t.getCurrentChainId(),
+  ), D = q(
+    b.WithdrawOnChainUtxos,
+    t,
+    s,
     o,
-    e,
-    await t.getEthereumAddress()
+    await e.getEthereumAddressByChain(t)
   );
-  return { tx: await k(
-    t.getCurrentChainId(),
-    I,
-    U,
-    y,
+  return { tx: await F(
+    t,
+    k,
+    E,
+    h,
     void 0,
     void 0,
     void 0,
-    E
-  ), amountToRecipient: c };
-}, bt = async (t, m, d) => {
-  const u = [], o = t.getCurrentChainId(), p = V(o, { erc20TokenAddress: m.erc20TokenAddress, tokenId: 0 }), a = await t.getEthereumAddress(), c = Z(a);
+    D
+  ), amountToRecipient: l };
+}, 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 e = ((await q({
-      hinkal: t,
+    const A = ((await G({
+      hinkal: e,
       sliceIfMore6: !1,
-      useBlockedUtxos: !0
-    }))?.get(p) ?? []).filter((r) => r.amount > 0n).slice(0, 6).sort((r, l) => Number(l.amount - r.amount)), i = N(e);
-    if (!i)
+      useBlockedUtxos: !0,
+      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 s = e.map((r) => r.nullifier).filter((r) => !!r), { tx: f } = await j(t, m, i, d);
-    s.length > 0 && await Y(o, c, s), u.push(f);
+    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 u;
+  return p;
 };
 export {
-  bt 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 S=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const h=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 m=require("../event-service/evm/BlockchainEventEmitter.cjs"),q=require("../event-service/solana/SolanaBlockchainEventEmitter.cjs"),d=require("@solana/web3.js");require("../crypto-keys/keys.cjs");const T=require("../../functions/web3/events/balanceChangedCustomHandler.cjs"),C=require("../snapshot/SnapshotFetcherService.cjs"),f=require("../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs"),w=require("../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs"),E=require("../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.cjs"),y=require("../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.cjs"),g=require("../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs"),F=require("../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs"),P=require("../snapshot/evm-snapshots/ClientApprovalsSnapshotService.cjs"),A=require("../../functions/utils/create-provider.cjs"),I=async e=>{const o=e.getCurrentChainId(),{maxPageSize:s,fetchRpcUrl:p,contractData:l}=u.networkRegistry[e.getCurrentChainId()];e.commitmentsSnapshotService?.intervalClear(),e.nullifierSnapshotService?.intervalClear(),e.accessTokenSnapshotService?.intervalClear(),e.approvalsSnapshotService?.intervalClear();let t,i;if(u.isSolanaLike(o)){const r=l.hinkalAddress;if(!p||!r)throw new Error("Fetch RPC URL or Solana program ID is not set");const c=A.createCustomSolanaConnection(p),n=new d.PublicKey(r);t=new q.SolanaBlockchainEventEmitter(c,n,0,!1,s);const v=l.hinkalIdl;v&&t.setIdl(v);const a=new C.SnapshotFetcherService(o,r);e.commitmentsSnapshotService=new f.ClientSolanaCommitmentsSnapshotService(t,a),e.nullifierSnapshotService=new w.ClientSolanaNullifierSnapshotService(t,a),e.accessTokenSnapshotService=new E.ClientSolanaAccessTokenSnapshotService(t,a),e.approvalsSnapshotService=void 0}else{const r=e.getContractWithFetcher(S.ContractType.HinkalContract),c=e.getContractWithFetcher(S.ContractType.DepositOnChainUtxos);t=new m.BlockchainEventEmitter(r,0,!1,s,c),i=new m.BlockchainEventEmitter(e.getContractWithFetcher(S.ContractType.AccessTokenContract),0,!1,s);const n=new C.SnapshotFetcherService(o,r.address);e.commitmentsSnapshotService=new g.ClientCommitmentsSnapshotService(t,n),e.nullifierSnapshotService=new F.ClientNullifierSnapshotService(t,n),e.accessTokenSnapshotService=new y.ClientAccessTokenSnapshotService(i,n),e.approvalsSnapshotService=new P.ClientApprovalsSnapshotService(t,n)}await Promise.all([e.commitmentsSnapshotService.init(),e.nullifierSnapshotService.init(),e.accessTokenSnapshotService.init(),e.approvalsSnapshotService?.init()]),await Promise.all([t.init(),i?.init()]),e.merkleTreeHinkal=e.commitmentsSnapshotService.merkleTree,e.merkleTreeAccessToken=e.accessTokenSnapshotService.merkleTree,e.nullifiers=e.nullifierSnapshotService.nullifiers,e.encryptedOutputs=e.commitmentsSnapshotService.encryptedOutputs,e.approvalsSnapshotService&&(e.approvals=e.approvalsSnapshotService.approvals),t.onEventsProcessed=r=>{r>0&&T.balanceChangedCustomHandler({updateType:h.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0})}};exports.resetMerkleTrees=I;
+"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.d.ts

@@ -1,2 +1,2 @@
 import { IHinkal } from './IHinkal';
-export declare const resetMerkleTrees: (hinkal: IHinkal) => Promise<void>;
+export declare const resetMerkleTrees: (hinkal: IHinkal, chainIds?: number[]) => Promise<void>;

package/data-structures/Hinkal/resetMerkleTrees.mjs

@@ -1,9 +1,10 @@
-import { networkRegistry as C, isSolanaLike as h } 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 p } from "../../types/ethereum-network.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 u } 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,57 +13,110 @@ import "buffer";
 import "../../constants/vite.constants.mjs";
 import "../../error-handling/error-codes.constants.mjs";
 import "../../constants/save-depths.mjs";
-import { BlockchainEventEmitter as v } from "../event-service/evm/BlockchainEventEmitter.mjs";
-import { SolanaBlockchainEventEmitter as d } from "../event-service/solana/SolanaBlockchainEventEmitter.mjs";
-import { PublicKey as T } from "@solana/web3.js";
+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 w } from "../../functions/web3/events/balanceChangedCustomHandler.mjs";
-import { SnapshotFetcherService as f } from "../snapshot/SnapshotFetcherService.mjs";
-import { ClientSolanaCommitmentsSnapshotService as g } from "../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.mjs";
-import { ClientSolanaNullifierSnapshotService as E } from "../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.mjs";
-import { ClientSolanaAccessTokenSnapshotService as y } from "../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.mjs";
-import { ClientAccessTokenSnapshotService as F } from "../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.mjs";
-import { ClientCommitmentsSnapshotService as I } from "../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.mjs";
-import { ClientNullifierSnapshotService as P } from "../snapshot/evm-snapshots/ClientNullifierSnapshotService.mjs";
-import { ClientApprovalsSnapshotService as A } from "../snapshot/evm-snapshots/ClientApprovalsSnapshotService.mjs";
-import { createCustomSolanaConnection as U } from "../../functions/utils/create-provider.mjs";
-const oe = async (e) => {
-  const n = e.getCurrentChainId(), { maxPageSize: i, fetchRpcUrl: m, contractData: S } = C[e.getCurrentChainId()];
-  e.commitmentsSnapshotService?.intervalClear(), e.nullifierSnapshotService?.intervalClear(), e.accessTokenSnapshotService?.intervalClear(), e.approvalsSnapshotService?.intervalClear();
-  let t, s;
-  if (h(n)) {
-    const r = S.hinkalAddress;
-    if (!m || !r)
-      throw new Error("Fetch RPC URL or Solana program ID is not set");
-    const a = U(m), o = new T(r);
-    t = new d(a, o, 0, !1, i);
-    const l = S.hinkalIdl;
-    l && t.setIdl(l);
-    const c = new f(n, r);
-    e.commitmentsSnapshotService = new g(t, c), e.nullifierSnapshotService = new E(t, c), e.accessTokenSnapshotService = new y(t, c), e.approvalsSnapshotService = void 0;
-  } else {
-    const r = e.getContractWithFetcher(p.HinkalContract), a = e.getContractWithFetcher(p.DepositOnChainUtxos);
-    t = new v(r, 0, !1, i, a), s = new v(
-      e.getContractWithFetcher(p.AccessTokenContract),
-      0,
-      !1,
-      i
-    );
-    const o = new f(n, r.address);
-    e.commitmentsSnapshotService = new I(t, o), e.nullifierSnapshotService = new P(t, o), e.accessTokenSnapshotService = new F(s, o), e.approvalsSnapshotService = new A(t, o);
-  }
-  await Promise.all([
-    e.commitmentsSnapshotService.init(),
-    e.nullifierSnapshotService.init(),
-    e.accessTokenSnapshotService.init(),
-    e.approvalsSnapshotService?.init()
-  ]), await Promise.all([t.init(), s?.init()]), e.merkleTreeHinkal = e.commitmentsSnapshotService.merkleTree, e.merkleTreeAccessToken = e.accessTokenSnapshotService.merkleTree, e.nullifiers = e.nullifierSnapshotService.nullifiers, e.encryptedOutputs = e.commitmentsSnapshotService.encryptedOutputs, e.approvalsSnapshotService && (e.approvals = e.approvalsSnapshotService.approvals), t.onEventsProcessed = (r) => {
-    r > 0 && w({
-      updateType: u.FreshWithoutLoader,
-      updateTokensListBefore: !0
-    });
-  };
+import { balanceChangedCustomHandler as U } from "../../functions/web3/events/balanceChangedCustomHandler.mjs";
+import { SnapshotFetcherService as T } from "../snapshot/SnapshotFetcherService.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 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 F = f.map(async (e) => {
+    const { maxPageSize: a, fetchRpcUrl: y, contractData: B } = P[e];
+    let o, p;
+    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 = K(y), s = new R(r), n = g(e);
+      o = new A(
+        e,
+        l,
+        s,
+        0,
+        n,
+        a
+      );
+      const h = B.hinkalIdl;
+      h && o.setIdl(h);
+      const C = new T(e, r);
+      t.commitmentsSnapshotServiceByChain[e] = new L(
+        o,
+        C
+      ), t.nullifierSnapshotServiceByChain[e] = new O(
+        o,
+        C
+      ), t.accessTokenSnapshotServiceByChain[e] = new W(
+        o,
+        C
+      ), t.approvalsSnapshotServiceByChain[e] = void 0;
+    } else {
+      const r = t.getContractWithFetcherByChainId(e, v.HinkalContract), l = t.getContractWithFetcherByChainId(
+        e,
+        v.DepositOnChainUtxos
+      ), s = g(e);
+      o = new w(
+        u.MainContractEvents,
+        e,
+        r,
+        0,
+        s,
+        a,
+        l
+      ), p = new w(
+        u.MainContractEvents,
+        e,
+        t.getContractWithFetcherByChainId(e, v.AccessTokenContract),
+        0,
+        s,
+        a
+      );
+      const n = new T(e, r.address);
+      t.commitmentsSnapshotServiceByChain[e] = new H(
+        o,
+        n
+      ), t.nullifierSnapshotServiceByChain[e] = new b(
+        o,
+        n
+      ), t.accessTokenSnapshotServiceByChain[e] = new D(
+        p,
+        n
+      ), t.approvalsSnapshotServiceByChain[e] = new k(
+        o,
+        n
+      );
+    }
+    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([
+      i.init(),
+      m.init(),
+      c.init(),
+      S?.init()
+    ]), 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: M.FreshWithoutLoader,
+        updateTokensListBefore: !0
+      });
+    };
+  });
+  await Promise.allSettled(F);
 };
 export {
-  oe 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("../http/HttpClient.cjs");const b=require("../../error-handling/logger.cjs"),_=require("../../functions/utils/erc20tokenFunctions.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("circomlibjs-hinkal-fork");const N=require("../../functions/web3/etherFunctions.cjs");require("../crypto-keys/keys.cjs");require("../../error-handling/error-codes.constants.cjs");require("axios");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@solana/spl-token");require("../../functions/utils/userAgent.cjs");require("multiformats");const C=require("../../API/API.cjs");require("../../API/tenderly.api.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>;