@hinkal/common 0.2.31 → 0.2.33

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -1,144 +1,123 @@
-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 { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { isSolanaLike as t, isTronLike as n, networkRegistry as r } 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 { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
+import { countTotalAmountInUtxos as o } from "../../functions/utils/amounts.utils.mjs";
+import { RELAYER_TX_CONFIRMATION_TIMEOUT as s } from "../../constants/tx-confirmation.constants.mjs";
+import { UserKeys as c } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as l } from "../../functions/utils/time.utils.mjs";
+import { encodeTokenWithId as u } from "../../functions/utils/encodeTokenWithId.mjs";
+import { addressToHexFormat as d, reorderZkCallData as f } from "../../functions/utils/tron.utils.mjs";
+import { getInputUtxoAndBalancePerToken as p } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as h } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as g } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as _ } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildCommitmentValidationData as y } from "../../functions/pre-transaction/buildCommitmentValidationData.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";
+import { waitForTransactionConfirmation as b } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { constructZkProof as x } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { constructSolanaZkProof as S } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as C, transactCallRelayer as w } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as T } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { ethers as E } from "ethers";
 //#region libs/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);
+var D = async (e, t, n, r) => {
+	let i = [...await h(e, t, n, r, void 0, void 0, !1, !0)], a = [], o = l().toString();
+	for (let t = 0; t < n.length; t += 1) {
+		let { outputUtxos: n } = g(e.userKeys, i[t], r[t], o);
+		a.push(n);
 	}
 	return {
 		inputUtxosArray: i,
-		outputUtxosArray: o,
-		hinkalLogicArgs: s
+		outputUtxosArray: a
 	};
-}, 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);
+}, O = async (e, t, n, r) => {
+	let i = [...await h(e, t, n, r, 6, void 0, !1, !0)][0], a = l().toString(), { outputUtxos: o } = g(e.userKeys, i, r[0], a);
 	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 = {
+}, k = async (t, r, a, o, s) => {
+	let c = n(r), l = [a.erc20TokenAddress], u = a.erc20TokenAddress, [p, m] = await Promise.all([v(r, u, l, e.Transact), t.getRandomRelay(r, !0)]);
+	if (!m) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let h = d(s), g = o - p.flatFee;
+	if (g <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${o}, Fee: ${p.flatFee}`);
+	let _ = [-g];
+	T(r, l, _, p);
+	let b = {
 		externalActionId: 0n,
-		externalAddress: y,
+		externalAddress: h,
 		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);
+	}, { inputUtxosArray: S, outputUtxosArray: C } = await D(t, r, l, _), [{ zkCallData: E, circomData: O, dimData: k }, A] = await Promise.all([x(t.merkleTreeHinkalByChain[r], S, C, t.userKeys, b.externalActionId, b.externalAddress, b.externalActionMetadata, t.generateProofRemotely, p, m, r), y(r, t.userKeys, l, S)]);
 	return {
-		tx: await A(i, I, R, L, void 0, void 0, S(o.WithdrawOnChainUtxos, i, d, x, v), z),
-		amountToRecipient: b
+		tx: await w(r, E, k, O, A, void 0, void 0, void 0, await f(c, E, k, O)),
+		amountToRecipient: g
 	};
-}, 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]
+}, A = async (t, n, o, s, l, u) => {
+	let d = [o.erc20TokenAddress], { originalDeployer: f } = r[n].contractData;
+	if (!f) throw Error("missing data");
+	let { userKeys: p, merkleTreeHinkalByChain: m } = t, h = o.erc20TokenAddress, [g, b] = await Promise.all([v(n, h, d, e.Transact, void 0, void 0, {
+		mintTo: d[0],
+		recipient: l,
+		nullifierCount: u
+	}), t.getRandomRelay(n, !0)]);
+	if (!b) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let x = s - g.flatFee;
+	if (x <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${g.flatFee}`);
+	let w = [-x];
+	w[0] -= g.flatFee;
+	let { inputUtxos: T, outputUtxos: D } = await O(t, n, d, w), k = c.findCorrectRandomization(a(31), t.userKeys.getShieldedPrivateKey()), A = {
+		tokenNumber: d.length,
+		nullifierAmount: T.length,
+		outputAmount: D.length
+	}, j = _([D])[0][0], M = Array.from(E.getBytes(j)), [{ proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I }, L] = await Promise.all([S(t.generateProofRemotely, m[n], p, [d[0]], [T], [D], k, g.flatFee, g.variableRate, l, b, A, [M], n), y(n, p, d, [T])]), R = {
+		recipient: l,
+		mint: d[0] === "11111111111111111111111111111111" ? void 0 : d[0]
 	};
 	return {
-		tx: await k({
+		tx: await C({
 			chainId: n,
-			relayAddress: y,
+			relayAddress: b,
 			functionName: "transact",
 			args: {
-				proofAArr: B,
-				proofBArr: V,
-				proofCArr: H,
-				publicInputsArr: U,
-				encryptedOutputs: [z],
-				relayerFee: v.flatFee.toString(),
-				dimensions: I
+				proofAArr: N,
+				proofBArr: P,
+				proofCArr: F,
+				publicInputsArr: I,
+				encryptedOutputs: [M],
+				relayerFee: g.flatFee.toString(),
+				dimensions: A
 			},
-			accounts: W,
-			solanaAccessTokenData: !A && D ? {
-				ethereumAddress: x,
-				accessKey: m.getAccessKey()
-			} : void 0
+			accounts: R,
+			commitmentValidationData: L
 		}),
-		amountToRecipient: S
+		amountToRecipient: x
 	};
-}, 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, {
+}, j = async (e, n, r, i, a, o) => t(n) ? A(e, n, r, i, a, o) : k(e, n, r, i, a), M = async (e, t, n) => {
+	let r = [], i = m([t]), a = u(i, {
 		erc20TokenAddress: t.erc20TokenAddress,
 		tokenId: 0
 	});
 	for (;;) {
 		await e.resetMerkleTreesIfNecessary([i]);
-		let o = ((await g({
+		let c = ((await p({
 			hinkal: e,
 			sliceIfMore6: !1,
 			useBlockedUtxos: !0,
-			allowRemoteDecryption: !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, {
+			chainId: i,
+			allowRemoteDecryption: e.generateProofRemotely
+		}))?.get(a) ?? []).filter((e) => e.amount > 0n).sort((e, t) => Number(t.amount - e.amount)).slice(0, 6), l = o(c);
+		if (!l) break;
+		let { tx: u } = await j(e, i, t, l, n, c.length);
+		await b(i, u, {
 			solanaCommitment: "finalized",
-			evmTimeoutMs: u
-		}), r.push(c);
+			evmTimeoutMs: s
+		}), r.push(u);
 	}
 	return r;
 };
 //#endregion
-export { R as hinkalWithdrawStuckUtxos };
+export { M as hinkalWithdrawStuckUtxos };

package/data-structures/Hinkal/index.cjs

@@ -1 +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`);
+require(`./hinkalDeposit.cjs`),require(`./prepareDepositOnChainUtxosZkProof.cjs`),require(`./hinkalDepositAndWithdraw.cjs`),require(`./hinkalSwap.cjs`),require(`./hinkalWithdraw.cjs`),require(`./resetMerkleTrees.cjs`),require(`./hinkalPrivateWallet.cjs`),require(`./hinkalProxySwap.cjs`),require(`./hinkalTransfer.cjs`),require(`./hinkalSolanaDepositAndWithdraw.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`),require(`./hinkalPalSolanaDepositPrepare.cjs`),require(`./hinkalPalEvmDeposit.cjs`),require(`./hinkalPalTronDepositPrepare.cjs`);

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

@@ -16,3 +16,8 @@ export * from './hinkalClaimUtxo';
 export * from './hinkalSolanaProoflessDeposit';
 export * from './hinkalSolanaClaimUtxo';
 export * from './hinkalWithdrawStuckUtxos';
+export * from './hinkalPalSolanaDepositPrepare';
+export * from './hinkalPalEvmDeposit';
+export * from './hinkalPalTronDepositPrepare';
+export * from './prepareDepositOnChainUtxosZkProof';
+export * from './hinkalSolanaDepositAndWithdraw';

package/data-structures/Hinkal/index.mjs

@@ -1,4 +1,5 @@
 import "./hinkalDeposit.mjs";
+import "./prepareDepositOnChainUtxosZkProof.mjs";
 import "./hinkalDepositAndWithdraw.mjs";
 import "./hinkalSwap.mjs";
 import "./hinkalWithdraw.mjs";
@@ -6,6 +7,7 @@ import "./resetMerkleTrees.mjs";
 import "./hinkalPrivateWallet.mjs";
 import "./hinkalProxySwap.mjs";
 import "./hinkalTransfer.mjs";
+import "./hinkalSolanaDepositAndWithdraw.mjs";
 import "./hinkalSolanaTransfer.mjs";
 import "./hinkalSolanaProxySend.mjs";
 import "./hinkalSolanaProxySwap.mjs";
@@ -15,3 +17,6 @@ import "./hinkalSolanaProoflessDeposit.mjs";
 import "./hinkalSolanaClaimUtxo.mjs";
 import "./hinkalWithdrawStuckUtxos.mjs";
 import "./Hinkal.mjs";
+import "./hinkalPalSolanaDepositPrepare.mjs";
+import "./hinkalPalEvmDeposit.mjs";
+import "./hinkalPalTronDepositPrepare.mjs";

package/data-structures/Hinkal/prepareDepositOnChainUtxosZkProof.cjs

@@ -0,0 +1 @@
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/hinkal.types.cjs`),i=require(`../../functions/web3/events/getShieldedBalance.cjs`),a=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),o=require(`../../functions/utils/fees.utils.cjs`),s=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`);let c=require(`ethers`);var l=async(l,u,d,f,p,m={})=>{let h=d.erc20TokenAddress,g=f.map(e=>e+o.calculateTotalFee(e,p)),_=g.reduce((e,t)=>e+t,0n),v=[h],y=[0n],b=[!0],x=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint256[]`],[g]),{hinkalWrapperAddress:S,hinkalWrapperABI:C,depositOnChainUtxosExternalActionAddress:w,depositOnChainUtxosExternalActionABI:T}=t.networkRegistry[u].contractData;if(!S||!C||!w||!T)throw Error(`contract data not set in networkRegistry`);let E=[...await i.addPaddingToUtxos(l,u,v,y)],D=[];for(let e=0;e<E.length;e+=1){let{outputUtxos:t}=a.outputUtxoProcessing(l.userKeys,E[e],y[e]);D.push(t)}let{zkCallData:O,circomData:k,dimData:A}=await s.constructZkProof(l.merkleTreeHinkalByChain[u],E,D,l.userKeys,e.ExternalActionId.DepositOnChainUtxos,w,x,l.generateProofRemotely,r.zeroFeeStructure,n.zeroAddress,u,b,m.hookData,S);return{zkCallData:O,circomData:k,dimData:A,utxoAmounts:g,totalAmount:_,hinkalWrapperAddress:S,depositOnChainUtxosExternalActionAddress:w,hinkalWrapperABI:C,depositOnChainUtxosExternalActionABI:T,inputUtxosArray:E}};exports.prepareDepositOnChainUtxosZkProof=l;

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

@@ -0,0 +1,22 @@
+import { ethers } from 'ethers';
+import { ERC20Token } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { HookDataType } from '../../types/circom-data.types';
+import { Utxo } from '../utxo/Utxo';
+import { IHinkal } from './IHinkal';
+interface PrepareOptions {
+    hookData?: HookDataType;
+}
+export declare const prepareDepositOnChainUtxosZkProof: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, options?: PrepareOptions) => Promise<{
+    zkCallData: import('../..').NewZkCallDataType;
+    circomData: import('../..').CircomDataType;
+    dimData: import('../..').DimDataType;
+    utxoAmounts: bigint[];
+    totalAmount: bigint;
+    hinkalWrapperAddress: string;
+    depositOnChainUtxosExternalActionAddress: string;
+    hinkalWrapperABI: ethers.InterfaceAbi;
+    depositOnChainUtxosExternalActionABI: ethers.InterfaceAbi;
+    inputUtxosArray: Utxo[][];
+}>;
+export {};

package/data-structures/Hinkal/prepareDepositOnChainUtxosZkProof.mjs

@@ -0,0 +1,34 @@
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { zeroFeeStructure as r } from "../../types/hinkal.types.mjs";
+import { addPaddingToUtxos as i } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as a } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calculateTotalFee as o } from "../../functions/utils/fees.utils.mjs";
+import { constructZkProof as s } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { ethers as c } from "ethers";
+//#region libs/shared/common/src/data-structures/Hinkal/prepareDepositOnChainUtxosZkProof.ts
+var l = async (l, u, d, f, p, m = {}) => {
+	let h = d.erc20TokenAddress, g = f.map((e) => e + o(e, p)), _ = g.reduce((e, t) => e + t, 0n), v = [h], y = [0n], b = [!0], x = c.AbiCoder.defaultAbiCoder().encode(["uint256[]"], [g]), { hinkalWrapperAddress: S, hinkalWrapperABI: C, depositOnChainUtxosExternalActionAddress: w, depositOnChainUtxosExternalActionABI: T } = t[u].contractData;
+	if (!S || !C || !w || !T) throw Error("contract data not set in networkRegistry");
+	let E = [...await i(l, u, v, y)], D = [];
+	for (let e = 0; e < E.length; e += 1) {
+		let { outputUtxos: t } = a(l.userKeys, E[e], y[e]);
+		D.push(t);
+	}
+	let { zkCallData: O, circomData: k, dimData: A } = await s(l.merkleTreeHinkalByChain[u], E, D, l.userKeys, e.DepositOnChainUtxos, w, x, l.generateProofRemotely, r, n, u, b, m.hookData, S);
+	return {
+		zkCallData: O,
+		circomData: k,
+		dimData: A,
+		utxoAmounts: g,
+		totalAmount: _,
+		hinkalWrapperAddress: S,
+		depositOnChainUtxosExternalActionAddress: w,
+		hinkalWrapperABI: C,
+		depositOnChainUtxosExternalActionABI: T,
+		inputUtxosArray: E
+	};
+};
+//#endregion
+export { l as prepareDepositOnChainUtxosZkProof };

package/data-structures/Hinkal/resetMerkleTrees.cjs

@@ -1 +1 @@
-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;
+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/mutexes.utils.cjs`),a=require(`../../functions/utils/create-provider.cjs`),o=require(`../../functions/utils/getContractAddress.cjs`),s=require(`../../functions/web3/events/balanceChangedHandler.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/evm-snapshots/ClientCommitmentsSnapshotService.cjs`),m=require(`../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs`);require(`../snapshot/index.cjs`);let h=require(`async-mutex`),g=require(`@solana/web3.js`);var _=new Map,v=e=>{let t=_.get(e);return t||(t=new h.Mutex,_.set(e,t)),t},y=async(h,_)=>{let y=(_??h.getSupportedChains()).map(_=>v(_).runExclusive(async()=>{h.commitmentsSnapshotServiceByChain[_]?.intervalClear(),h.nullifierSnapshotServiceByChain[_]?.intervalClear();let{maxPageSize:v,fetchRpcUrl:y,contractData:b}=t.networkRegistry[_],x;if(t.isSolanaLike(_)){let e=b.hinkalAddress;if(!y||!e)throw Error(`Fetch RPC URL or Solana program ID is not set`);x=new l.ClientSolanaBlockchainEventEmitter(_,a.createCustomSolanaConnection(y),new g.PublicKey(e),0,i.getChainBalanceFetchingMutex(_),v);let t=b.hinkalIdl;t&&x.setIdl(t);let n=new u.SnapshotFetcherService(_,e);h.commitmentsSnapshotServiceByChain[_]=new d.ClientSolanaCommitmentsSnapshotService(x,n),h.nullifierSnapshotServiceByChain[_]=new f.ClientSolanaNullifierSnapshotService(x,n)}else{let t=h.getContractWithFetcherByChainId(_,e.ContractType.HinkalContract),n=h.getContractWithFetcherByChainId(_,e.ContractType.DepositOnChainUtxos),a=i.getChainBalanceFetchingMutex(_);x=new c.ClientBlockchainEventEmitter(r.EventCategory.MainContractEvents,_,t,0,a,v,n);let s=new u.SnapshotFetcherService(_,o.getContractAddress(t));h.commitmentsSnapshotServiceByChain[_]=new p.ClientCommitmentsSnapshotService(x,s),h.nullifierSnapshotServiceByChain[_]=new m.ClientNullifierSnapshotService(x,s)}let S=h.commitmentsSnapshotServiceByChain[_],C=h.nullifierSnapshotServiceByChain[_];if(!S||!C)throw Error(`Missing snapshot service for chain ${_}`);await Promise.all([S.init(),C.init()]),await x.init(),h.merkleTreeHinkalByChain[_]=S.merkleTree,h.nullifiersByChain[_]=C.nullifiers,h.encryptedOutputsByChain[_]=S.encryptedOutputs,x.onEventsProcessed=e=>{e>0&&s.balanceChangedHandler({updateType:n.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0,chainIdToUpdate:_})}}));await Promise.allSettled(y)};exports.resetMerkleTrees=y;

package/data-structures/Hinkal/resetMerkleTrees.mjs

@@ -3,61 +3,54 @@ import { isSolanaLike as t, networkRegistry as n } from "../../constants/chains.
 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 { getChainBalanceFetchingMutex as a } from "../../functions/utils/mutexes.utils.mjs";
+import { createCustomSolanaConnection as o } from "../../functions/utils/create-provider.mjs";
+import { getContractAddress as s } from "../../functions/utils/getContractAddress.mjs";
+import { balanceChangedHandler as c } from "../../functions/web3/events/balanceChangedHandler.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 { ClientCommitmentsSnapshotService as m } from "../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.mjs";
+import { ClientNullifierSnapshotService as h } from "../snapshot/evm-snapshots/ClientNullifierSnapshotService.mjs";
 import "../snapshot/index.mjs";
-import { PublicKey as y } from "@solana/web3.js";
+import { Mutex as g } from "async-mutex";
+import { PublicKey as _ } from "@solana/web3.js";
 //#region libs/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;
+var v = /* @__PURE__ */ new Map(), y = (e) => {
+	let t = v.get(e);
+	return t || (t = new g(), v.set(e, t)), t;
+}, b = async (g, v) => {
+	let b = (v ?? g.getSupportedChains()).map((v) => y(v).runExclusive(async () => {
+		g.commitmentsSnapshotServiceByChain[v]?.intervalClear(), g.nullifierSnapshotServiceByChain[v]?.intervalClear();
+		let { maxPageSize: y, fetchRpcUrl: b, contractData: x } = n[v], S;
+		if (t(v)) {
+			let e = x.hinkalAddress;
+			if (!b || !e) throw Error("Fetch RPC URL or Solana program ID is not set");
+			S = new u(v, o(b), new _(e), 0, a(v), y);
+			let t = x.hinkalIdl;
+			t && S.setIdl(t);
+			let n = new d(v, e);
+			g.commitmentsSnapshotServiceByChain[v] = new f(S, n), g.nullifierSnapshotServiceByChain[v] = new p(S, n);
 		} 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 t = g.getContractWithFetcherByChainId(v, e.HinkalContract), n = g.getContractWithFetcherByChainId(v, e.DepositOnChainUtxos), r = a(v);
+			S = new l(i.MainContractEvents, v, t, 0, r, y, n);
+			let o = new d(v, s(t));
+			g.commitmentsSnapshotServiceByChain[v] = new m(S, o), g.nullifierSnapshotServiceByChain[v] = new h(S, o);
 		}
-		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) => {
+		let C = g.commitmentsSnapshotServiceByChain[v], w = g.nullifierSnapshotServiceByChain[v];
+		if (!C || !w) throw Error(`Missing snapshot service for chain ${v}`);
+		await Promise.all([C.init(), w.init()]), await S.init(), g.merkleTreeHinkalByChain[v] = C.merkleTree, g.nullifiersByChain[v] = w.nullifiers, g.encryptedOutputsByChain[v] = C.encryptedOutputs, S.onEventsProcessed = (e) => {
 			e > 0 && c({
 				updateType: r.FreshWithoutLoader,
 				updateTokensListBefore: !0,
-				chainIdToUpdate: x
+				chainIdToUpdate: v
 			});
 		};
-	});
-	await Promise.allSettled(C);
+	}));
+	await Promise.allSettled(b);
 };
 //#endregion
 export { b as resetMerkleTrees };

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

@@ -1 +1 @@
-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;
+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`);const o=require(`../../functions/utils/aggregateTokenAmounts.cjs`);let s=require(`idb-keyval`);var c=class{generateTxId(){return`tx_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async getTransactionRecord(){return await(0,s.get)(t.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(n){let{from:r,to:i,gasInDollar:a,extraNativeTokenFee:c,chainId:l,status:u,txHash:d,activityType:f,tokensReceive:p,tokensSpend:m,tokensApprove:h,activityIcon:g,dappUrl:_,dappName:v,integrationProvider:y,knownPartialSignature:b}=n,x=this.generateTxId(),S=m?.length?o.aggregateTokensBySymbol(m):[],C=p?.length?o.aggregateTokensBySymbol(p):[],w={id:x,from:r,to:i,gasInDollar:a?.toString(),extraNativeTokenFee:c?.toString(),chainId:l,txHash:d,activityType:f,status:u??e.ActivityStatus.PENDING,timestamp:new Date,tokensReceive:C,tokensSpend:S,tokensApprove:h,activityIcon:g,dappUrl:_,dappName:v,integrationProvider:y,knownPartialSignature:b};return await(0,s.update)(t.StorageKeys.TX_ACTIVITY,(e={})=>(e[x]=w,e)),x}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,s.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,s.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,s.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)}}},l=new c;exports.ActivityStorage=c,exports.activityStorage=l;

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

@@ -7,37 +7,38 @@ import { Logger as i } from "../../error-handling/logger.mjs";
 import "../../error-handling/index.mjs";
 import { waitForTransactionConfirmation as a } from "../../functions/utils/tx-confirmation.utils.mjs";
 import "../../functions/index.mjs";
-import { get as o, update as s } from "idb-keyval";
+import { aggregateTokensBySymbol as o } from "../../functions/utils/aggregateTokenAmounts.mjs";
+import { get as s, update as c } from "idb-keyval";
 //#region libs/shared/common/src/data-structures/IndexedDB/activity-db.ts
-var c = class {
+var l = class {
 	generateTxId() {
 		return `tx_${(/* @__PURE__ */ new Date()).getTime()}_${Math.random().toString(36).substring(2, 15)}`;
 	}
 	async getTransactionRecord() {
-		return await o(t.TX_ACTIVITY) || {};
+		return await s(t.TX_ACTIVITY) || {};
 	}
 	async saveTxRequest(n) {
-		let { from: r, to: i, gasInDollar: a, extraNativeTokenFee: o, 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,
+		let { from: r, to: i, gasInDollar: a, extraNativeTokenFee: s, chainId: l, status: u, txHash: d, activityType: f, tokensReceive: p, tokensSpend: m, tokensApprove: h, activityIcon: g, dappUrl: _, dappName: v, integrationProvider: y, knownPartialSignature: b } = n, x = this.generateTxId(), S = m?.length ? o(m) : [], C = p?.length ? o(p) : [], w = {
+			id: x,
 			from: r,
 			to: i,
 			gasInDollar: a?.toString(),
-			extraNativeTokenFee: o?.toString(),
-			chainId: c,
-			txHash: u,
-			activityType: d,
-			status: l ?? e.PENDING,
+			extraNativeTokenFee: s?.toString(),
+			chainId: l,
+			txHash: d,
+			activityType: f,
+			status: u ?? e.PENDING,
 			timestamp: /* @__PURE__ */ new Date(),
-			tokensReceive: f,
-			tokensSpend: p,
-			tokensApprove: m,
-			activityIcon: h,
-			dappUrl: g,
-			dappName: _,
-			integrationProvider: v,
-			knownPartialSignature: y
+			tokensReceive: C,
+			tokensSpend: S,
+			tokensApprove: h,
+			activityIcon: g,
+			dappUrl: _,
+			dappName: v,
+			integrationProvider: y,
+			knownPartialSignature: b
 		};
-		return await s(t.TX_ACTIVITY, (e = {}) => (e[b] = x, e)), b;
+		return await c(t.TX_ACTIVITY, (e = {}) => (e[x] = w, e)), x;
 	}
 	async getTxRequest(e) {
 		return (await this.getTransactionRecord())[e] || null;
@@ -53,7 +54,7 @@ var c = class {
 			...r,
 			txHash: n
 		};
-		await s(t.TX_ACTIVITY, (t = {}) => (t[e] = i, t));
+		await c(t.TX_ACTIVITY, (t = {}) => (t[e] = i, t));
 	}
 	async updateTxStatusAndHash(e, n, r) {
 		let i = await this.getTxRequest(e);
@@ -64,7 +65,7 @@ var c = class {
 			txHash: r,
 			timestamp: /* @__PURE__ */ new Date()
 		};
-		return await s(t.TX_ACTIVITY, (t = {}) => (t[e] = a, t)), a;
+		return await c(t.TX_ACTIVITY, (t = {}) => (t[e] = a, t)), a;
 	}
 	async updateActivity(e, t, n) {
 		try {
@@ -75,7 +76,7 @@ var c = class {
 	}
 	async removePendingTransactions(e) {
 		try {
-			await s(t.TX_ACTIVITY, (t = {}) => (delete t[e], t));
+			await c(t.TX_ACTIVITY, (t = {}) => (delete t[e], t));
 		} catch (e) {
 			i.error("error in deleting tx requests", e);
 		}
@@ -104,6 +105,6 @@ var c = class {
 			i.error("error in updating pending transactions", e);
 		}
 	}
-}, l = new c();
+}, u = new l();
 //#endregion
-export { c as ActivityStorage, l as activityStorage };
+export { l as ActivityStorage, u as activityStorage };

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

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../functions/utils/caseInsensitive.utils.cjs`),t=require(`../../error-handling/logger.cjs`);require(`../../functions/index.cjs`);let n=require(`idb-keyval`);var r=new class{STORAGE_KEY=`contacts`;checkForDuplicate(e,t,n){if(e.find(({ethereumAddress:e,nickname:r})=>(e===t.ethereumAddress||r===t.nickname)&&e!==n)!==void 0)throw Error(`Duplicate Contact attribute`)}async createContact(e,t){let r=e.toLowerCase();await(0,n.update)(this.STORAGE_KEY,e=>{let n=e??{},i=n[r]??[];return this.checkForDuplicate(i,t),i.push(t),n[r]=i,n})}async getContacts(e){try{let t=e.toLowerCase(),r=await(0,n.get)(this.STORAGE_KEY);return!r||!r[t]?[]:r[t]}catch(e){return t.Logger.error(`Error while getting contacts:`,e),[]}}async editContact(t,r,i){let a=t.toLowerCase();await(0,n.update)(this.STORAGE_KEY,t=>{let n=t??{},o=n[a];if(!n||!o)throw Error(`Contacts could not be fetched`);this.checkForDuplicate(o,i,r);let s=o.findIndex(({ethereumAddress:t})=>e.caseInsensitiveEqual(t,r));if(s===-1)throw Error(`Contact to be edited was not found`);return o[s]=i,n[a]=o,n})}async deleteContact(e,t){let r=e.toLowerCase();await(0,n.update)(this.STORAGE_KEY,e=>{let n=e??{},i=n[r];if(!n||!i)throw Error(`Contacts could not be fetched`);return n[r]=i.filter(({ethereumAddress:e})=>e!==t),n})}};exports.contactStorage=r;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../functions/utils/caseInsensitive.utils.cjs`),t=require(`../../functions/utils/addresses.cjs`),n=require(`../../error-handling/logger.cjs`);require(`../../functions/index.cjs`);let r=require(`idb-keyval`);var i=new class{STORAGE_KEY=`contacts`;checkForDuplicate(e,t,n){if(e.find(({ethereumAddress:e,nickname:r})=>(e===t.ethereumAddress||r===t.nickname)&&e!==n)!==void 0)throw Error(`Duplicate Contact attribute`)}async createContact(e,t){let n=e.toLowerCase();await(0,r.update)(this.STORAGE_KEY,e=>{let r=e??{},i=r[n]??[];return this.checkForDuplicate(i,t),i.push(t),r[n]=i,r})}async getContacts(e){try{await this.removeOldStylePrivateAddressContacts(e);let t=e.toLowerCase(),n=await(0,r.get)(this.STORAGE_KEY);return!n||!n[t]?[]:n[t]}catch(e){return n.Logger.error(`Error while getting contacts:`,e),[]}}async editContact(t,n,i){let a=t.toLowerCase();await(0,r.update)(this.STORAGE_KEY,t=>{let r=t??{},o=r[a];if(!r||!o)throw Error(`Contacts could not be fetched`);this.checkForDuplicate(o,i,n);let s=o.findIndex(({ethereumAddress:t})=>e.caseInsensitiveEqual(t,n));if(s===-1)throw Error(`Contact to be edited was not found`);return o[s]=i,r[a]=o,r})}async removeOldStylePrivateAddressContacts(e){let n=e.toLowerCase(),i=0;return await(0,r.update)(this.STORAGE_KEY,e=>{let r=e??{},a=r[n];if(!a?.length)return r;let o=a.filter(e=>{let n=e.ethereumAddress;return!t.isValidOldStylePrivateAddress(n)||t.isValidPrivateAddress(n)?!0:(i+=1,!1)});return i===0||(r[n]=o),r}),i}async deleteContact(e,t){let n=e.toLowerCase();await(0,r.update)(this.STORAGE_KEY,e=>{let r=e??{},i=r[n];if(!r||!i)throw Error(`Contacts could not be fetched`);return r[n]=i.filter(({ethereumAddress:e})=>e!==t),r})}};exports.contactStorage=i;

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

@@ -5,6 +5,7 @@ declare class ContactStorage {
     createContact(walletAddress: string, newContact: Contact): Promise<void>;
     getContacts(walletAddress: string): Promise<Contact[]>;
     editContact(walletAddress: string, oldContactAddress: string, editedContact: Contact): Promise<void>;
+    private removeOldStylePrivateAddressContacts;
     deleteContact(walletAddress: string, contactAddressToDelete: string): Promise<void>;
 }
 export declare const contactStorage: ContactStorage;