@hinkal/common 0.2.26 → 0.2.28

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -1,145 +1,236 @@
-import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as E } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as k } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as R } 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 { transactionErrorCodes as B } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as F } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as W } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as z, solanaTransactCallRelayer as Y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as D } from "../../types/external-action.types.mjs";
+import { Utxo as Z } from "../utxo/Utxo.mjs";
+import { defaultHinkalLogicArgs as V } from "../../types/hinkal.types.mjs";
+import { outputApprovalDataProcessing as q } 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 { mergeWithFeeStructure as G } 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 { AdminTransactionType as H } from "../../types/admin.types.mjs";
+import { ContractType as X } from "../../types/ethereum-network.types.mjs";
+import { AdminTransactionType as j } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
-import { getSignatureDataForTransact as N } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as $ } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { shouldPatchAccessTokenMerkleTree as J } 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 b } from "../../functions/utils/amounts.utils.mjs";
-import "ethers";
+import "../../constants/vite.constants.mjs";
+import { countTotalAmountInUtxos as Q } from "../../functions/utils/amounts.utils.mjs";
+import { randomBigInt as I } from "../../functions/web3/etherFunctions.mjs";
 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 { solanaNativeAddress as tt } from "../../constants/protocol.constants.mjs";
+import "../../constants/tokens.constants.mjs";
+import { isSolanaLike as et, isTronLike as ot, networkRegistry as rt } from "../../constants/chains.constants.mjs";
+import { constructAdminData as st } 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 { ethers as nt } from "ethers";
+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";
-const Y = async (t, s, m, d) => {
-  const r = [s.erc20TokenAddress], u = s.erc20TokenAddress, i = await L(
-    t.getCurrentChainId(),
-    u,
-    r,
-    F.Transact
-  ), c = m - i.flatFee;
-  if (c <= 0n)
-    throw new Error(`Insufficient balance to cover fee. Balance: ${m}, Fee: ${i.flatFee}`);
-  const e = [-c];
-  W(t.getCurrentChainId(), r, e, i);
-  const o = {
-    externalActionId: 0n,
-    externalAddress: d,
-    externalActionMetadata: "0x00"
-  }, n = [
-    ...await z(t, r, e, void 0, void 0, !1, !0)
-  ], x = `swapperM${e.length.toString()}x${n[0].length}x1`, f = M(e.length, t.userKeys), T = O().toString(), A = [];
-  for (let a = 0; a < r.length; a += 1) {
-    const { outputUtxos: S } = E(
-      t.userKeys,
-      n[a],
-      e[a],
-      T,
+import "tweetnacl";
+import "bs58";
+import "buffer";
+import { calcEncryptedOutputs as at } from "../../functions/snarkjs/common.snarkjs.mjs";
+import "lodash";
+import { getKycAndSignatureData as it } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { getCurrentTimeInSeconds as O } from "../../functions/utils/time.utils.mjs";
+import { getInputUtxoAndBalancePerToken as ct } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import { addPaddingToUtxos as K } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { encodeTokenWithId as mt } from "../../functions/utils/encodeTokenWithId.mjs";
+import { validateAndGetChainId as ut } from "../../functions/utils/token-check.utils.mjs";
+import { constructSolanaZkProof as pt } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { waitForTransactionConfirmation as lt } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { addressToHexFormat as P, reorderZkCallData as ft } from "../../functions/utils/tron.utils.mjs";
+import { RELAYER_TX_CONFIRMATION_TIMEOUT as dt } from "../../constants/tx-confirmation.constants.mjs";
+const At = async (e, t, a, s) => {
+  const o = [
+    ...await K(e, t, a, s, void 0, void 0, !1, !0)
+  ], i = [], r = V(s.length, e.userKeys), p = O().toString();
+  for (let n = 0; n < a.length; n += 1) {
+    const { outputUtxos: c } = F(
+      e.userKeys,
+      o[n],
+      s[n],
+      p,
       void 0,
       !1
     );
-    A.push(S);
-    const { useApprovalUtxoData: g } = K(t, n[a], e[a]);
-    g && (f.useApprovalUtxoData[a] = g, f.doPreTxApproval = !0);
+    i.push(c);
+    const { useApprovalUtxoData: m } = q(e, t, o[n], s[n]);
+    m && (r.useApprovalUtxoData[n] = m, r.doPreTxApproval = !0);
   }
-  const l = await t.getRandomRelay(!0);
-  if (!l)
-    throw Error(P.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: C, kycRequired: w, hasAccessToken: I } = await $(
-    t,
-    r,
-    e
-  ), v = await N(
-    t.getCurrentChainId(),
-    await t.getEthereumAddress(),
-    t.userKeys,
-    w,
-    I
-  ), { zkCallData: y, circomData: U, dimData: h } = await k(
+  return { inputUtxosArray: o, outputUtxosArray: i, hinkalLogicArgs: r };
+}, gt = async (e, t, a, s) => {
+  const o = [
+    ...await K(e, t, a, s, 6, void 0, !1, !0)
+  ][0], i = O().toString(), { outputUtxos: r } = F(
+    e.userKeys,
+    o,
+    s[0],
+    i,
+    void 0,
+    !1
+  );
+  return { inputUtxos: o, outputUtxos: r };
+}, yt = async (e, t, a, s, o) => {
+  const i = ot(t), r = [a.erc20TokenAddress], p = a.erc20TokenAddress, [n, c, m] = await Promise.all([
+    L(t, p, r, D.Transact),
+    e.getRandomRelay(t, !0),
+    e.getEthereumAddressByChain(t)
+  ]), f = P(m);
+  if (!c)
+    throw Error(B.RELAYER_NOT_AVAILABLE);
+  const k = P(o), u = s - n.flatFee;
+  if (u <= 0n)
+    throw new Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${n.flatFee}`);
+  const l = [-u];
+  G(t, r, l, n);
+  const A = {
+    externalActionId: 0n,
+    externalAddress: k,
+    externalActionMetadata: "0x00"
+  }, [{ patchAccessTokenMerkleTree: g, signatureData: y }, { inputUtxosArray: x, outputUtxosArray: S, hinkalLogicArgs: C }] = await Promise.all([
+    it(e, t, r, l, f),
+    At(e, t, r, l)
+  ]), w = `swapperM${l.length.toString()}x${x[0].length}x1`, { zkCallData: d, circomData: v, dimData: T } = await W(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    n,
-    A,
-    t.userKeys,
+    e.merkleTreeHinkalByChain[t],
+    e.merkleTreeAccessTokenByChain[t],
     x,
-    o.externalActionId,
-    o.externalAddress,
-    o.externalActionMetadata,
-    t.generateProofRemotely,
-    l,
-    t.getCurrentChainId(),
+    S,
+    e.userKeys,
+    w,
+    A.externalActionId,
+    A.externalAddress,
+    A.externalActionMetadata,
+    e.generateProofRemotely,
+    c,
+    t,
     void 0,
     void 0,
     void 0,
+    g,
     C,
-    f,
     void 0,
-    i,
-    t.getContractWithFetcher(B.HinkalHelperContract),
-    v,
-    void 0,
-    !1
-  ), D = _(
-    H.WithdrawOnChainUtxos,
-    t.getCurrentChainId(),
+    n,
+    e.getContractWithFetcher(t, X.HinkalHelperContract),
+    y
+  ), R = await ft(i, d, T, v), U = st(
+    j.WithdrawOnChainUtxos,
+    t,
     r,
-    e,
-    await t.getEthereumAddress()
+    l,
+    f
   );
-  return { tx: await R(
-    t.getCurrentChainId(),
-    y,
-    h,
-    U,
-    void 0,
+  return { tx: await z(
+    t,
+    d,
+    T,
+    v,
     void 0,
     void 0,
-    D
-  ), amountToRecipient: c };
-}, Lt = async (t, s, m) => {
-  const d = [], r = t.getCurrentChainId(), u = V(r, { erc20TokenAddress: s.erc20TokenAddress, tokenId: 0 });
+    U,
+    R
+  ), amountToRecipient: u };
+}, Tt = async (e, t, a, s, o, i) => {
+  const r = [a.erc20TokenAddress], { originalDeployer: p, hinkalIdl: n } = rt[t].contractData;
+  if (!p || !n)
+    throw new Error("missing data");
+  const { userKeys: c, merkleTreeAccessTokenByChain: m, merkleTreeHinkalByChain: f } = e, k = a.erc20TokenAddress, [u, l, A] = await Promise.all([
+    L(t, k, r, D.Transact, void 0, void 0, {
+      mintTo: r[0],
+      recipient: o,
+      nullifierCount: i
+    }),
+    e.getRandomRelay(t, !0),
+    e.getEthereumAddressByChain(t)
+  ]);
+  if (!l)
+    throw Error(B.RELAYER_NOT_AVAILABLE);
+  const g = s - u.flatFee;
+  if (g <= 0n)
+    throw new Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${u.flatFee}`);
+  const y = [-g];
+  y[0] -= u.flatFee;
+  const [{ patchAccessTokenMerkleTree: x, kycRequired: S, hasAccessToken: C }, { inputUtxos: w, outputUtxos: d }] = await Promise.all([
+    J(e, t, r, y),
+    gt(e, t, r, y)
+  ]), v = Z.findCorrectRandomization(I(31), e.userKeys.getShieldedPrivateKey()), T = {
+    tokenNumber: r.length,
+    nullifierAmount: w.length,
+    outputAmount: d.length
+  }, R = e.getSolanaProgram(n), U = at([d])[0][0], E = Array.from(nt.getBytes(U)), { proofAArr: M, proofBArr: N, proofCArr: b, publicInputsArr: _ } = await pt(
+    e.generateProofRemotely,
+    p,
+    f[t],
+    m[t],
+    c,
+    R,
+    [r[0]],
+    [w],
+    [d],
+    v,
+    u.flatFee,
+    u.variableRate,
+    o,
+    l,
+    T,
+    [E],
+    t,
+    x
+  ), H = r[0] === tt, $ = {
+    recipient: o,
+    mint: H ? void 0 : r[0]
+  }, h = {
+    proofAArr: M,
+    proofBArr: N,
+    proofCArr: b,
+    publicInputsArr: _,
+    encryptedOutputs: [E],
+    relayerFee: u.flatFee.toString(),
+    dimensions: T
+  };
+  return { tx: await Y({
+    chainId: t,
+    relayAddress: l,
+    functionName: "transact",
+    args: h,
+    accounts: $,
+    solanaAccessTokenData: !C && S ? {
+      ethereumAddress: A,
+      accessKey: c.getAccessKey()
+    } : void 0
+  }), amountToRecipient: g };
+}, xt = async (e, t, a, s, o, i) => et(t) ? Tt(e, t, a, s, o, i) : yt(e, t, a, s, o), de = async (e, t, a) => {
+  const s = [], o = ut([t]), i = mt(o, { erc20TokenAddress: t.erc20TokenAddress, tokenId: 0 });
   for (; ; ) {
-    await t.resetMerkleTreesIfNecessary();
-    const c = ((await q({
-      hinkal: t,
+    await e.resetMerkleTreesIfNecessary([o]);
+    const p = ((await ct({
+      hinkal: e,
       sliceIfMore6: !1,
-      useBlockedUtxos: !0
-    }))?.get(u) ?? []).filter((o) => o.amount > 0n).slice(0, 6).sort((o, n) => Number(n.amount - o.amount)), p = b(c);
-    if (!p)
+      useBlockedUtxos: !0,
+      chainId: o
+    }))?.get(i) ?? []).filter((m) => m.amount > 0n).sort((m, f) => Number(f.amount - m.amount)).slice(0, 6), n = Q(p);
+    if (!n)
       break;
-    const { tx: e } = await Y(t, s, p, m);
-    d.push(e);
+    const { tx: c } = await xt(
+      e,
+      o,
+      t,
+      n,
+      a,
+      p.length
+    );
+    await lt(o, c, {
+      solanaCommitment: "finalized",
+      evmTimeoutMs: dt
+    }), s.push(c);
   }
-  return d;
+  return s;
 };
 export {
-  Lt as hinkalWithdrawStuckUtxos
+  de as hinkalWithdrawStuckUtxos
 };

package/data-structures/Hinkal/index.d.ts

@@ -3,6 +3,7 @@ export * from './IHinkal';
 export * from './hinkalDeposit';
 export * from './hinkalSwap';
 export * from './hinkalTransfer';
+export * from './hinkalSolanaTransfer';
 export * from './hinkalWithdraw';
 export * from './hinkalPrivateWallet';
 export * from './resetMerkleTrees';
@@ -11,4 +12,7 @@ export * from './hinkalSolanaProxySwap';
 export * from './hinkalSolanaProxySend';
 export * from './hinkalSolanaProxyShield';
 export * from './hinkalDepositAndWithdraw';
+export * from './hinkalClaimUtxo';
+export * from './hinkalSolanaProoflessDeposit';
+export * from './hinkalSolanaClaimUtxo';
 export * from './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/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"),d=require("../event-service/solana/SolanaBlockchainEventEmitter.cjs"),q=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"),g=require("../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.cjs"),E=require("../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.cjs"),y=require("../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs"),A=require("../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs"),F=require("../snapshot/evm-snapshots/ClientApprovalsSnapshotService.cjs"),P=require("../../functions/utils/create-provider.cjs"),I=require("../../functions/utils/getContractAddress.cjs"),b=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=P.createCustomSolanaConnection(p),n=new q.PublicKey(r);t=new d.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 g.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,I.getContractAddress(r));e.commitmentsSnapshotService=new y.ClientCommitmentsSnapshotService(t,n),e.nullifierSnapshotService=new A.ClientNullifierSnapshotService(t,n),e.accessTokenSnapshotService=new E.ClientAccessTokenSnapshotService(i,n),e.approvalsSnapshotService=new F.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=b;
+"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/activities.types.cjs");const A=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 g=require("../event-service/evm/ClientBlockchainEventEmitter.cjs");require("@coral-xyz/anchor");const P=require("../event-service/solana/ClientSolanaBlockchainEventEmitter.cjs"),k=require("@solana/web3.js");require("../crypto-keys/keys.cjs");const M=require("../../functions/web3/events/balanceChangedCustomHandler.cjs"),w=require("../snapshot/SnapshotFetcherService.cjs"),x=require("../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs"),b=require("../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs"),U=require("../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.cjs"),_=require("../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.cjs"),N=require("../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs"),O=require("../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs"),R=require("../snapshot/evm-snapshots/ClientApprovalsSnapshotService.cjs"),H=require("../../functions/utils/create-provider.cjs"),f=require("../../functions/utils/mutexes.utils.cjs"),L=require("../../functions/utils/getContractAddress.cjs"),W=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=f.getChainBalanceFetchingMutex(e);r=new P.ClientSolanaBlockchainEventEmitter(e,C,i,0,s,a);const B=y.hinkalIdl;B&&r.setIdl(B);const v=new w.SnapshotFetcherService(e,n);t.commitmentsSnapshotServiceByChain[e]=new x.ClientSolanaCommitmentsSnapshotService(r,v),t.nullifierSnapshotServiceByChain[e]=new b.ClientSolanaNullifierSnapshotService(r,v),t.accessTokenSnapshotServiceByChain[e]=new U.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=f.getChainBalanceFetchingMutex(e);r=new g.ClientBlockchainEventEmitter(T.EventCategory.MainContractEvents,e,n,0,i,a,C),c=new g.ClientBlockchainEventEmitter(T.EventCategory.AccessTokenContractEvents,e,t.getContractWithFetcherByChainId(e,u.ContractType.AccessTokenContract),0,i,a);const s=new w.SnapshotFetcherService(e,L.getContractAddress(n));t.commitmentsSnapshotServiceByChain[e]=new N.ClientCommitmentsSnapshotService(r,s),t.nullifierSnapshotServiceByChain[e]=new O.ClientNullifierSnapshotService(r,s),t.accessTokenSnapshotServiceByChain[e]=new _.ClientAccessTokenSnapshotService(c,s),t.approvalsSnapshotServiceByChain[e]=new R.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&&M.balanceChangedCustomHandler({updateType:A.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0,chainIdToUpdate:e})}});await Promise.allSettled(F)};exports.resetMerkleTrees=W;

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,8 +1,9 @@
-import { networkRegistry as C, isSolanaLike as h } from "../../constants/chains.constants.mjs";
+import { networkRegistry as P, isSolanaLike as A } 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/activities.types.mjs";
-import { PrivateBalanceUpdateType as u } from "../../types/balances.types.mjs";
+import { PrivateBalanceUpdateType as x } from "../../types/balances.types.mjs";
+import { EventCategory as u } from "../../types/events.types.mjs";
 import "ethers";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
@@ -11,58 +12,112 @@ 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 T } from "../event-service/evm/ClientBlockchainEventEmitter.mjs";
+import "@coral-xyz/anchor";
+import { ClientSolanaBlockchainEventEmitter as M } from "../event-service/solana/ClientSolanaBlockchainEventEmitter.mjs";
+import { PublicKey as U } 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";
-import { getContractAddress as x } from "../../functions/utils/getContractAddress.mjs";
-const ne = 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 c = U(m), o = new T(r);
-    t = new d(c, o, 0, !1, i);
-    const l = S.hinkalIdl;
-    l && t.setIdl(l);
-    const a = new f(n, r);
-    e.commitmentsSnapshotService = new g(t, a), e.nullifierSnapshotService = new E(t, a), e.accessTokenSnapshotService = new y(t, a), e.approvalsSnapshotService = void 0;
-  } else {
-    const r = e.getContractWithFetcher(p.HinkalContract), c = e.getContractWithFetcher(p.DepositOnChainUtxos);
-    t = new v(r, 0, !1, i, c), s = new v(
-      e.getContractWithFetcher(p.AccessTokenContract),
-      0,
-      !1,
-      i
-    );
-    const o = new f(n, x(r));
-    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 R } from "../../functions/web3/events/balanceChangedCustomHandler.mjs";
+import { SnapshotFetcherService as w } 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 k } from "../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.mjs";
+import { ClientCommitmentsSnapshotService as D } from "../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.mjs";
+import { ClientNullifierSnapshotService as H } from "../snapshot/evm-snapshots/ClientNullifierSnapshotService.mjs";
+import { ClientApprovalsSnapshotService as b } 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";
+import { getContractAddress as N } from "../../functions/utils/getContractAddress.mjs";
+const he = 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 (A(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 U(r), n = g(e);
+      o = new M(
+        e,
+        l,
+        s,
+        0,
+        n,
+        a
+      );
+      const h = B.hinkalIdl;
+      h && o.setIdl(h);
+      const C = new w(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 T(
+        u.MainContractEvents,
+        e,
+        r,
+        0,
+        s,
+        a,
+        l
+      ), p = new T(
+        u.AccessTokenContractEvents,
+        e,
+        t.getContractWithFetcherByChainId(e, v.AccessTokenContract),
+        0,
+        s,
+        a
+      );
+      const n = new w(e, N(r));
+      t.commitmentsSnapshotServiceByChain[e] = new D(
+        o,
+        n
+      ), t.nullifierSnapshotServiceByChain[e] = new H(
+        o,
+        n
+      ), t.accessTokenSnapshotServiceByChain[e] = new k(
+        p,
+        n
+      ), t.approvalsSnapshotServiceByChain[e] = new b(
+        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 && R({
+        updateType: x.FreshWithoutLoader,
+        updateTokensListBefore: !0,
+        chainIdToUpdate: e
+      });
+    };
+  });
+  await Promise.allSettled(F);
 };
 export {
-  ne as resetMerkleTrees
+  he as resetMerkleTrees
 };

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

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