@hinkal/common 0.2.27 → 0.2.29

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

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

package/data-structures/Hinkal/index.cjs

@@ -0,0 +1 @@
+require(`./hinkalDeposit.cjs`),require(`./hinkalDepositAndWithdraw.cjs`),require(`./hinkalSwap.cjs`),require(`./hinkalWithdraw.cjs`),require(`./resetMerkleTrees.cjs`),require(`./hinkalPrivateWallet.cjs`),require(`./hinkalProxySwap.cjs`),require(`./hinkalTransfer.cjs`),require(`./hinkalSolanaTransfer.cjs`),require(`./hinkalSolanaProxySend.cjs`),require(`./hinkalSolanaProxySwap.cjs`),require(`./hinkalSolanaProxyShield.cjs`),require(`./hinkalClaimUtxo.cjs`),require(`./hinkalSolanaProoflessDeposit.cjs`),require(`./hinkalSolanaClaimUtxo.cjs`),require(`./hinkalWithdrawStuckUtxos.cjs`),require(`./Hinkal.cjs`);

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/index.mjs

@@ -0,0 +1,17 @@
+import "./hinkalDeposit.mjs";
+import "./hinkalDepositAndWithdraw.mjs";
+import "./hinkalSwap.mjs";
+import "./hinkalWithdraw.mjs";
+import "./resetMerkleTrees.mjs";
+import "./hinkalPrivateWallet.mjs";
+import "./hinkalProxySwap.mjs";
+import "./hinkalTransfer.mjs";
+import "./hinkalSolanaTransfer.mjs";
+import "./hinkalSolanaProxySend.mjs";
+import "./hinkalSolanaProxySwap.mjs";
+import "./hinkalSolanaProxyShield.mjs";
+import "./hinkalClaimUtxo.mjs";
+import "./hinkalSolanaProoflessDeposit.mjs";
+import "./hinkalSolanaClaimUtxo.mjs";
+import "./hinkalWithdrawStuckUtxos.mjs";
+import "./Hinkal.mjs";

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;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/balances.types.cjs`),r=require(`../../types/events.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/getContractAddress.cjs`),a=require(`../../functions/utils/mutexes.utils.cjs`),o=require(`../../functions/utils/create-provider.cjs`),s=require(`../../functions/web3/events/balanceChangedCustomHandler.cjs`),c=require(`../event-service/evm/ClientBlockchainEventEmitter.cjs`),l=require(`../event-service/solana/ClientSolanaBlockchainEventEmitter.cjs`);require(`../event-service/index.cjs`);const u=require(`../snapshot/SnapshotFetcherService.cjs`),d=require(`../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs`),f=require(`../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs`),p=require(`../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.cjs`),m=require(`../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.cjs`),h=require(`../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs`),g=require(`../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs`),_=require(`../snapshot/evm-snapshots/ClientApprovalsSnapshotService.cjs`);require(`../snapshot/index.cjs`);let v=require(`@solana/web3.js`);var y=async(y,b)=>{let x=b??y.getSupportedChains();x.forEach(e=>{y.commitmentsSnapshotServiceByChain[e]?.intervalClear(),y.nullifierSnapshotServiceByChain[e]?.intervalClear(),y.accessTokenSnapshotServiceByChain[e]?.intervalClear(),y.approvalsSnapshotServiceByChain[e]?.intervalClear()});let S=x.map(async b=>{let{maxPageSize:x,fetchRpcUrl:S,contractData:C}=t.networkRegistry[b],w,T;if(t.isSolanaLike(b)){let e=C.hinkalAddress;if(!S||!e)throw Error(`Fetch RPC URL or Solana program ID is not set`);w=new l.ClientSolanaBlockchainEventEmitter(b,o.createCustomSolanaConnection(S),new v.PublicKey(e),0,a.getChainBalanceFetchingMutex(b),x);let t=C.hinkalIdl;t&&w.setIdl(t);let n=new u.SnapshotFetcherService(b,e);y.commitmentsSnapshotServiceByChain[b]=new d.ClientSolanaCommitmentsSnapshotService(w,n),y.nullifierSnapshotServiceByChain[b]=new f.ClientSolanaNullifierSnapshotService(w,n),y.accessTokenSnapshotServiceByChain[b]=new p.ClientSolanaAccessTokenSnapshotService(w,n),y.approvalsSnapshotServiceByChain[b]=void 0}else{let t=y.getContractWithFetcherByChainId(b,e.ContractType.HinkalContract),n=y.getContractWithFetcherByChainId(b,e.ContractType.DepositOnChainUtxos),o=a.getChainBalanceFetchingMutex(b);w=new c.ClientBlockchainEventEmitter(r.EventCategory.MainContractEvents,b,t,0,o,x,n),T=new c.ClientBlockchainEventEmitter(r.EventCategory.AccessTokenContractEvents,b,y.getContractWithFetcherByChainId(b,e.ContractType.AccessTokenContract),0,o,x);let s=new u.SnapshotFetcherService(b,i.getContractAddress(t));y.commitmentsSnapshotServiceByChain[b]=new h.ClientCommitmentsSnapshotService(w,s),y.nullifierSnapshotServiceByChain[b]=new g.ClientNullifierSnapshotService(w,s),y.accessTokenSnapshotServiceByChain[b]=new m.ClientAccessTokenSnapshotService(T,s),y.approvalsSnapshotServiceByChain[b]=new _.ClientApprovalsSnapshotService(w,s)}let E=y.commitmentsSnapshotServiceByChain[b],D=y.nullifierSnapshotServiceByChain[b],O=y.accessTokenSnapshotServiceByChain[b],k=y.approvalsSnapshotServiceByChain[b];if(!E||!D||!O)throw Error(`Missing snapshot service for chain ${b}`);await Promise.all([E.init(),D.init(),O.init(),k?.init()]),await Promise.all([w.init(),T?.init()]),y.merkleTreeHinkalByChain[b]=E.merkleTree,y.merkleTreeAccessTokenByChain[b]=O.merkleTree,y.nullifiersByChain[b]=D.nullifiers,y.encryptedOutputsByChain[b]=E.encryptedOutputs,k&&(y.approvalsByChain[b]=k.approvals),w.onEventsProcessed=e=>{e>0&&s.balanceChangedCustomHandler({updateType:n.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0,chainIdToUpdate:b})}});await Promise.allSettled(S)};exports.resetMerkleTrees=y;

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,68 +1,63 @@
-import { networkRegistry as C, isSolanaLike as h } from "../../constants/chains.constants.mjs";
-import "../../types/circom-data.types.mjs";
-import { ContractType as p } from "../../types/ethereum-network.types.mjs";
-import "../../types/activities.types.mjs";
-import { PrivateBalanceUpdateType as u } from "../../types/balances.types.mjs";
-import "ethers";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-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 "../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
-    });
-  };
-};
-export {
-  ne as resetMerkleTrees
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { isSolanaLike as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { PrivateBalanceUpdateType as r } from "../../types/balances.types.mjs";
+import { EventCategory as i } from "../../types/events.types.mjs";
+import "../../types/index.mjs";
+import { getContractAddress as a } from "../../functions/utils/getContractAddress.mjs";
+import { getChainBalanceFetchingMutex as o } from "../../functions/utils/mutexes.utils.mjs";
+import { createCustomSolanaConnection as s } from "../../functions/utils/create-provider.mjs";
+import { balanceChangedCustomHandler as c } from "../../functions/web3/events/balanceChangedCustomHandler.mjs";
+import { ClientBlockchainEventEmitter as l } from "../event-service/evm/ClientBlockchainEventEmitter.mjs";
+import { ClientSolanaBlockchainEventEmitter as u } from "../event-service/solana/ClientSolanaBlockchainEventEmitter.mjs";
+import "../event-service/index.mjs";
+import { SnapshotFetcherService as d } from "../snapshot/SnapshotFetcherService.mjs";
+import { ClientSolanaCommitmentsSnapshotService as f } from "../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.mjs";
+import { ClientSolanaNullifierSnapshotService as p } from "../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.mjs";
+import { ClientSolanaAccessTokenSnapshotService as m } from "../snapshot/solana-snapshots/ClientSolanaAccessTokenSnapshotService.mjs";
+import { ClientAccessTokenSnapshotService as h } from "../snapshot/evm-snapshots/ClientAccessTokenSnapshotService.mjs";
+import { ClientCommitmentsSnapshotService as g } from "../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.mjs";
+import { ClientNullifierSnapshotService as _ } from "../snapshot/evm-snapshots/ClientNullifierSnapshotService.mjs";
+import { ClientApprovalsSnapshotService as v } from "../snapshot/evm-snapshots/ClientApprovalsSnapshotService.mjs";
+import "../snapshot/index.mjs";
+import { PublicKey as y } from "@solana/web3.js";
+//#region ../shared/common/src/data-structures/Hinkal/resetMerkleTrees.ts
+var b = async (b, x) => {
+	let S = x ?? b.getSupportedChains();
+	S.forEach((e) => {
+		b.commitmentsSnapshotServiceByChain[e]?.intervalClear(), b.nullifierSnapshotServiceByChain[e]?.intervalClear(), b.accessTokenSnapshotServiceByChain[e]?.intervalClear(), b.approvalsSnapshotServiceByChain[e]?.intervalClear();
+	});
+	let C = S.map(async (x) => {
+		let { maxPageSize: S, fetchRpcUrl: C, contractData: w } = n[x], T, E;
+		if (t(x)) {
+			let e = w.hinkalAddress;
+			if (!C || !e) throw Error("Fetch RPC URL or Solana program ID is not set");
+			T = new u(x, s(C), new y(e), 0, o(x), S);
+			let t = w.hinkalIdl;
+			t && T.setIdl(t);
+			let n = new d(x, e);
+			b.commitmentsSnapshotServiceByChain[x] = new f(T, n), b.nullifierSnapshotServiceByChain[x] = new p(T, n), b.accessTokenSnapshotServiceByChain[x] = new m(T, n), b.approvalsSnapshotServiceByChain[x] = void 0;
+		} else {
+			let t = b.getContractWithFetcherByChainId(x, e.HinkalContract), n = b.getContractWithFetcherByChainId(x, e.DepositOnChainUtxos), r = o(x);
+			T = new l(i.MainContractEvents, x, t, 0, r, S, n), E = new l(i.AccessTokenContractEvents, x, b.getContractWithFetcherByChainId(x, e.AccessTokenContract), 0, r, S);
+			let s = new d(x, a(t));
+			b.commitmentsSnapshotServiceByChain[x] = new g(T, s), b.nullifierSnapshotServiceByChain[x] = new _(T, s), b.accessTokenSnapshotServiceByChain[x] = new h(E, s), b.approvalsSnapshotServiceByChain[x] = new v(T, s);
+		}
+		let D = b.commitmentsSnapshotServiceByChain[x], O = b.nullifierSnapshotServiceByChain[x], k = b.accessTokenSnapshotServiceByChain[x], A = b.approvalsSnapshotServiceByChain[x];
+		if (!D || !O || !k) throw Error(`Missing snapshot service for chain ${x}`);
+		await Promise.all([
+			D.init(),
+			O.init(),
+			k.init(),
+			A?.init()
+		]), await Promise.all([T.init(), E?.init()]), b.merkleTreeHinkalByChain[x] = D.merkleTree, b.merkleTreeAccessTokenByChain[x] = k.merkleTree, b.nullifiersByChain[x] = O.nullifiers, b.encryptedOutputsByChain[x] = D.encryptedOutputs, A && (b.approvalsByChain[x] = A.approvals), T.onEventsProcessed = (e) => {
+			e > 0 && c({
+				updateType: r.FreshWithoutLoader,
+				updateTokensListBefore: !0,
+				chainIdToUpdate: x
+			});
+		};
+	});
+	await Promise.allSettled(C);
 };
+//#endregion
+export { b 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;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/activities.types.cjs`),t=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../constants/tx-confirmation.constants.cjs`),i=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);const a=require(`../../functions/utils/tx-confirmation.utils.cjs`);require(`../../functions/index.cjs`);let o=require(`idb-keyval`);var s=class{generateTxId(){return`tx_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async getTransactionRecord(){return await(0,o.get)(t.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(n){let{from:r,to:i,gasInDollar:a,extraNativeTokenFee:s,chainId:c,status:l,txHash:u,activityType:d,tokensReceive:f,tokensSpend:p,tokensApprove:m,activityIcon:h,dappUrl:g,dappName:_,integrationProvider:v,knownPartialSignature:y}=n,b=this.generateTxId(),x={id:b,from:r,to:i,gasInDollar:a?.toString(),extraNativeTokenFee:s?.toString(),chainId:c,txHash:u,activityType:d,status:l??e.ActivityStatus.PENDING,timestamp:new Date,tokensReceive:f,tokensSpend:p,tokensApprove:m,activityIcon:h,dappUrl:g,dappName:_,integrationProvider:v,knownPartialSignature:y};return await(0,o.update)(t.StorageKeys.TX_ACTIVITY,(e={})=>(e[b]=x,e)),b}async getTxRequest(e){return(await this.getTransactionRecord())[e]||null}async getAllTxRequests(e){let t=await this.getTransactionRecord();return Object.values(t).filter(t=>t.chainId===e).sort((e,t)=>new Date(t.timestamp).getTime()-new Date(e.timestamp).getTime())}async updateTxHash(e,n){let r=await this.getTxRequest(e);if(!r)throw Error(`Activity not found`);let i={...r,txHash:n};await(0,o.update)(t.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=i,t))}async updateTxStatusAndHash(e,n,r){let i=await this.getTxRequest(e);if(!i)throw Error(`Transaction not found`);let a={...i,status:n,txHash:r,timestamp:new Date};return await(0,o.update)(t.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=a,t)),a}async updateActivity(e,t,n){try{await this.updateTxStatusAndHash(e,t,n)}catch(e){i.Logger.error(`error in updating tx request`,e)}}async removePendingTransactions(e){try{await(0,o.update)(t.StorageKeys.TX_ACTIVITY,(t={})=>(delete t[e],t))}catch(e){i.Logger.error(`error in deleting tx requests`,e)}}async updatePendingTransactions(t,o,s,c){try{let i=await this.getTxRequest(o);if(!i)throw Error(`Transaction not found`);let{chainId:l}=i;if(!t.success){c?.(t.error),await this.updateActivity(o,e.ActivityStatus.FAILED,`erroredTx`in t?t.erroredTx:void 0);return}if(`txHash`in t){let{txHash:i}=t;try{await a.waitForTransactionConfirmation(l,i,{evmTimeoutMs:r.RELAYER_TX_CONFIRMATION_TIMEOUT})}catch(t){let r=t instanceof Error?t:Error(n.transactionErrorCodes.UNKNOWN);c?.(r),await this.updateActivity(o,e.ActivityStatus.FAILED,i);return}s?.(),await this.updateActivity(o,e.ActivityStatus.SUCCESSFUL,i)}}catch(e){i.Logger.error(`error in updating pending transactions`,e)}}},c=new s;exports.ActivityStorage=s,exports.activityStorage=c;

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

@@ -1,15 +1,14 @@
-import { Activity, ActivityAddRequest, SandboxResponse } from '../../types';
-declare class ActivityStorage {
-    private generateTxId;
+import { Activity, ActivityAddRequest, TransactionResponse } from '../../types';
+export declare class ActivityStorage {
+    protected generateTxId(): string;
     private getTransactionRecord;
     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>;
-    updatePendingTransactions(transactionResponse: SandboxResponse, pendingActivityId: string): Promise<void>;
-    private getGasInDollar;
+    updatePendingTransactions(transactionResponse: TransactionResponse, pendingActivityId: string, onTxSuccess?: () => void, onTxError?: (errorResponse: Error) => void): Promise<void>;
 }
 export declare const activityStorage: ActivityStorage;
-export {};