@hinkal/common 0.3.2 → 0.3.3

package/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -1,113 +1,185 @@
-import { isSolanaLike as e, isTronLike as t, networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
 import "../../constants/protocol.constants.mjs";
-import { countTotalAmountInUtxos as r } from "../../functions/utils/amounts.utils.mjs";
-import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
-import { UserKeys as o } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
-import { normalizeTokenAddress as c } from "../../functions/utils/encodeTokenWithId.mjs";
-import { addressToHexFormat as l, reorderZkCallData as u } from "../../functions/utils/tron.utils.mjs";
-import { getInputUtxoAndBalancePerToken as d } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
-import { ExternalActionId as f } from "../../types/external-action.types.mjs";
-import { validateAndGetChainId as p } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as m } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as h } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { buildOutCommitments as g, calcEncryptedOutputs as _ } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { constructZkProof as y } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { constructSolanaZkProof as b } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as x, transactCallRelayer as S } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { updateHinkal as C } from "../../functions/auto-deposit-back-helpers/update-hinkal.mjs";
-import { mergeWithFeeStructure as w } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { ethers as T } from "ethers";
+import { countTotalAmountInUtxos as n } from "../../functions/utils/amounts.utils.mjs";
+import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
+import { UserKeys as a } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { normalizeTokenAddress as s } from "../../functions/utils/encodeTokenWithId.mjs";
+import { hashEthereumAddress as c } from "../../functions/utils/addresses.mjs";
+import { addressToHexFormat as l } from "../../functions/utils/tron.utils.mjs";
+import { getInputUtxoAndBalancePerToken as u } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import { ExternalActionId as d } from "../../types/external-action.types.mjs";
+import { SubmitMode as f } from "../../types/transact.types.mjs";
+import { Logger as p } from "../../error-handling/logger.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 { buildOutCommitments as _ } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { finalizeSolanaTxEnclaveCallRelay as v, finalizeTxEnclaveCallRelay as y, prepareSolanaStuckWithdrawEnclaveCall as b, prepareStuckWithdrawEnclaveCall as x } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { getFeeStructure as S } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { solanaTransactCallRelayer as C } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { hinkalTransact as w } from "./hinkalTransact.mjs";
+import { constructSolanaZkProof as T } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { updateHinkal as E } from "../../functions/auto-deposit-back-helpers/update-hinkal.mjs";
+import { mergeWithFeeStructure as D } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { ethers as O } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.ts
-var E = 6, D = async (e, t, n, r) => {
-	let i = [...await m(e, t, n, r, void 0, !1, !0)], a = [], o = s().toString();
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = h(e.userKeys, i[t], r[t], o);
-		a.push(n);
-	}
-	return {
-		inputUtxosArray: i,
-		outputUtxosArray: a
-	};
-}, O = async (e, t, n, r) => {
-	let i = [...await m(e, t, n, r, 6, !1, !0)][0], a = s().toString(), { outputUtxos: o } = h(e.userKeys, i, r[0], a);
+var k = 6, A = async (e, t, n, r) => {
+	let i = [...await h(e, t, n, r, 6, !1, !0)][0], a = o().toString(), { outputUtxos: s } = g(e.userKeys, i, r[0], a);
 	return {
 		inputUtxos: i,
-		outputUtxos: o
+		outputUtxos: s
 	};
-}, k = async (e, n, r, a, o) => {
-	let s = t(n), c = [r.erc20TokenAddress], d = r.erc20TokenAddress, [p, m] = await Promise.all([v(n, d, c, f.Transact), e.getRandomRelay(n, !0)]);
-	if (!m) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let h = l(o), g = a - p.flatFee;
-	if (g <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${p.flatFee}`);
-	let _ = [-g];
-	await w(n, c, _, p);
-	let b = {
-		externalActionId: 0n,
-		externalAddress: h,
-		externalActionMetadata: "0x00"
-	}, { inputUtxosArray: x, outputUtxosArray: T } = await D(e, n, c, _), { zkCallData: E, circomData: O, dimData: k, commitmentValidationData: A } = await y(e.merkleTreeHinkalByChain[n], x, T, e.userKeys, b.externalActionId, b.externalAddress, b.externalActionMetadata, e.generateProofRemotely, p, m, n), j = await u(s, E, k, O);
-	return C(n, e, O.inputNullifiers?.flat(), O.outCommitments?.flat(), O.encryptedOutputs?.flat()), {
-		tx: await S(n, E, k, O, A, void 0, void 0, void 0, j),
-		amountToRecipient: g
+}, j = async (e, t, n, i) => {
+	let a = n.erc20TokenAddress, o = await e.getEthereumAddressByChain(t), [s, u] = await Promise.all([S(t, a, [a], d.Transact), e.getRandomRelay(t, !0)]);
+	if (!u) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let f = await x(e, {
+		chainId: t,
+		erc20Address: a,
+		externalAddress: l(i),
+		relay: u,
+		feeStructure: s,
+		hashedEthereumAddress: c(o)
+	}), m = [];
+	for (let n = 0; n < f.length; n += 1) try {
+		let { jobId: r, signedMessageHash: i } = f[n], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
+		m.push(await y(r, {
+			R8: a,
+			S: o
+		}, t));
+	} catch (e) {
+		if (!m.length) throw e;
+		return p.error(`Stuck withdrawal partially submitted (${m.length}/${f.length})`, e), m;
+	}
+	return m;
+}, M = async (e, t, n) => {
+	let r = await Promise.all(Array.from({ length: k }, async (r, i) => {
+		let a = i + 1, o = await S(e, t, [t], d.Transact, void 0, void 0, {
+			mintTo: t,
+			recipient: n,
+			nullifierCount: a
+		});
+		return [String(a), o];
+	}));
+	return Object.fromEntries(r);
+}, N = async (e, t, n, i) => {
+	let a = n.erc20TokenAddress, [o, s, l] = await Promise.all([
+		e.getEthereumAddressByChain(t),
+		e.getRandomRelay(t, !0),
+		M(t, a, i)
+	]);
+	if (!s) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let u = await b(e, {
+		chainId: t,
+		mintAddress: a,
+		recipient: i,
+		relayAddress: s,
+		accounts: {
+			recipient: i,
+			mint: a === "11111111111111111111111111111111" ? void 0 : a
+		},
+		feeStructures: l,
+		hashedEthereumAddress: c(o)
+	}), d = [];
+	for (let n = 0; n < u.length; n += 1) {
+		let { jobId: r, signedMessageHash: i } = u[n], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
+		d.push(await v(r, {
+			R8: a,
+			S: o
+		}, t));
+	}
+	return d;
+}, P = async (e, t, n, i, a) => {
+	let o = [n.erc20TokenAddress], s = n.erc20TokenAddress, [c, u] = await Promise.all([S(t, s, o, d.Transact), e.getRandomRelay(t, !0)]);
+	if (!u) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let p = l(a), m = i - c.flatFee;
+	if (m <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${c.flatFee}`);
+	let h = [-m];
+	return await D(t, o, h, c), {
+		tx: await w(e, {
+			chainId: t,
+			erc20Addresses: o,
+			amountChanges: h,
+			externalAddress: p,
+			feeStructure: c,
+			relay: u,
+			useBlockedUtxos: !0,
+			onTxSubmitLocally: (n) => {
+				E(t, e, n.inputNullifiers?.flat(), n.outCommitments?.flat(), n.encryptedOutputs?.flat());
+			},
+			submit: { mode: f.Relayer }
+		}),
+		amountToRecipient: m
 	};
-}, A = async (e, t, r, s, c, l) => {
-	let u = [r.erc20TokenAddress], { originalDeployer: d } = n[t].contractData;
-	if (!d) throw Error("missing data");
-	let { userKeys: p, merkleTreeHinkalByChain: m } = e, h = r.erc20TokenAddress, [y, S] = await Promise.all([v(t, h, u, f.Transact, void 0, void 0, {
+}, F = async (e, n, o, s, c, l) => {
+	let u = [o.erc20TokenAddress], { originalDeployer: f } = t[n].contractData;
+	if (!f) throw Error("missing data");
+	let { userKeys: p, merkleTreeHinkalByChain: m } = e, h = o.erc20TokenAddress, [g, v] = await Promise.all([S(n, h, u, d.Transact, void 0, void 0, {
 		mintTo: u[0],
 		recipient: c,
 		nullifierCount: l
-	}), e.getRandomRelay(t, !0)]);
-	if (!S) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let w = s - y.flatFee;
-	if (w <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${y.flatFee}`);
-	let E = [-w];
-	E[0] -= y.flatFee;
-	let { inputUtxos: D, outputUtxos: k } = await O(e, t, u, E), A = o.findCorrectRandomization(a(31), e.userKeys.getShieldedPrivateKey()), j = {
+	}), e.getRandomRelay(n, !0)]);
+	if (!v) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let y = s - g.flatFee;
+	if (y <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${g.flatFee}`);
+	let b = [-y];
+	b[0] -= g.flatFee;
+	let { inputUtxos: x, outputUtxos: w } = await A(e, n, u, b), D = a.findCorrectRandomization(i(31), e.userKeys.getShieldedPrivateKey()), k = {
 		tokenNumber: u.length,
-		nullifierAmount: D.length,
-		outputAmount: k.length
-	}, M = _([k])[0][0], N = Array.from(T.getBytes(M)), { proofAArr: P, proofBArr: F, proofCArr: I, publicInputsArr: L, commitmentValidationData: R } = await b(e.generateProofRemotely, m[t], p, [u[0]], [D], [k], A, y.flatFee, y.variableRate, c, S, j, [N], t), z = {
+		nullifierAmount: x.length,
+		outputAmount: w.length
+	}, { proofAArr: j, proofBArr: M, proofCArr: N, publicInputsArr: P, commitmentValidationData: F, rootHashHinkalIndex: I, encryptedOutputs: L } = await T(m[n], p, [u[0]], [x], [w], D, g.flatFee, g.variableRate, c, v, k, void 0, n), R = {
 		recipient: c,
 		mint: u[0] === "11111111111111111111111111111111" ? void 0 : u[0]
-	}, B = {
-		proofAArr: P,
-		proofBArr: F,
-		proofCArr: I,
-		publicInputsArr: L,
-		encryptedOutputs: [N],
-		relayerFee: y.flatFee.toString(),
-		dimensions: j
+	}, z = await C({
+		chainId: n,
+		relayAddress: v,
+		functionName: "transact",
+		args: {
+			proofAArr: j,
+			proofBArr: M,
+			proofCArr: N,
+			publicInputsArr: P,
+			encryptedOutputs: L,
+			relayerFee: g.flatFee.toString(),
+			dimensions: k,
+			rootHashIndex: I.toString()
+		},
+		accounts: R,
+		commitmentValidationData: F
+	});
+	return E(n, e, x.map((e) => e.getNullifier()), _([w]).flat(), L.map((e) => O.hexlify(new Uint8Array(e)))), {
+		tx: z,
+		amountToRecipient: y
 	};
-	return C(t, e, D.map((e) => e.getNullifier()), g([k]).flat(), [M]), {
-		tx: await x({
-			chainId: t,
-			relayAddress: S,
-			functionName: "transact",
-			args: B,
-			accounts: z,
-			commitmentValidationData: R
-		}),
-		amountToRecipient: w
-	};
-}, j = async (t, n, r, i, a, o) => e(n) ? A(t, n, r, i, a, o) : k(t, n, r, i, a), M = async (e, t, n) => {
-	let i = [], a = p([t]), o = c(a, t.erc20TokenAddress);
-	await e.resetMerkleTreesIfNecessary([a]);
-	let s = ((await d({
-		hinkal: e,
+}, I = async (t, n, r, i, a, o) => e(n) ? F(t, n, r, i, a, o) : P(t, n, r, i, a), L = async (t, i, a) => {
+	let o = m([i]);
+	if (t.generateProofRemotely) {
+		let n = e(o) ? await N(t, o, i, a) : await j(t, o, i, a);
+		if (!n.length) throw Error(r.NO_STUCK_BALANCE_TO_WITHDRAW);
+		return n;
+	}
+	let c = [], l = s(o, i.erc20TokenAddress);
+	await t.resetMerkleTreesIfNecessary([o]);
+	let d = ((await u({
+		hinkal: t,
 		sliceIfMore6: !1,
 		useBlockedUtxos: !0,
-		chainId: a,
-		allowRemoteDecryption: e.generateProofRemotely
-	}))?.get(o) ?? []).filter((e) => e.amount > 0n).sort((e, t) => Number(t.amount - e.amount));
-	for (let o = 0; o < s.length; o += E) {
-		let c = s.slice(o, o + E), { tx: l } = await j(e, a, t, r(c), n, c.length);
-		i.push(l);
+		chainId: o
+	}))?.get(l) ?? []).filter((e) => e.amount > 0n).sort((e, t) => Number(t.amount - e.amount));
+	if (!d.length) throw Error(r.NO_STUCK_BALANCE_TO_WITHDRAW);
+	for (let e = 0; e < d.length; e += k) {
+		let r = d.slice(e, e + k), s = n(r);
+		try {
+			let { tx: e } = await I(t, o, i, s, a, r.length);
+			c.push(e);
+		} catch (e) {
+			if (!c.length) throw e;
+			return p.error(`Stuck withdrawal partially submitted (${c.length}/${Math.ceil(d.length / k)})`, e), c;
+		}
 	}
-	return i;
+	return c;
 };
 //#endregion
-export { M as hinkalWithdrawStuckUtxos };
+export { L as hinkalWithdrawStuckUtxos };

package/common/src/data-structures/Hinkal/prepareTronDepositToSelf.cjs

@@ -0,0 +1 @@
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../functions/utils/time.utils.cjs`),n=require(`../utxo/Utxo.cjs`),r=require(`../../functions/utils/tron.utils.cjs`),i=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`);var a=async(a,o,s,c,l,u={})=>{let d=s.erc20TokenAddress,f=r.addressToHexFormat(await a.getEthereumAddressByChain(o)),p=t.getCurrentTimeInSeconds().toString(),m=c.map(e=>e+l.flatFee),h=m.reduce((e,t)=>e+t,0n),g=m.map((e,t)=>new n.Utxo({amount:e,erc20TokenAddress:d,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:(BigInt(p)+BigInt(t)).toString(),spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint})),_=new n.Utxo({amount:0n,erc20TokenAddress:d,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:p,spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint}),v=[[_,_]],y=[g],{zkCallData:b,circomData:x,dimData:S}=await i.constructZkProof(a.merkleTreeHinkalByChain[o],v,y,a.userKeys,0n,f,`0x00`,l,e.zeroAddress,o,void 0,void 0,void 0,void 0,u.extraData,!0);return{zkCallData:b,circomData:x,dimData:S,utxoAmounts:m,totalDepositAmount:h,depositOutputUtxos:g}};exports.prepareTronDepositToSelf=a;

package/common/src/data-structures/Hinkal/prepareTronDepositToSelf.d.ts

@@ -0,0 +1,27 @@
+import { CircomDataType, DimDataType } from '../../types/circom-data.types';
+import { NewZkCallDataType } from '../../types/snark.types';
+import { ERC20Token } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { Utxo } from '../utxo/Utxo';
+import { IHinkal } from './IHinkal';
+interface PrepareTronDepositOptions {
+    extraData?: string;
+}
+interface TronDepositToSelf {
+    zkCallData: NewZkCallDataType;
+    circomData: CircomDataType;
+    dimData: DimDataType;
+    utxoAmounts: bigint[];
+    totalDepositAmount: bigint;
+    depositOutputUtxos: Utxo[];
+}
+/**
+ * Builds the ZK proof for a Tron deposit to the user's own shielded key.
+ *
+ * Produces one output UTXO per recipient amount (each holding `amount + fee`),
+ * all assigned to the user's own shielded key so they can be spent in a
+ * subsequent withdrawal step. Inputs are zero-amount padding (the circuit skips
+ * the merkle membership check when amount is 0).
+ */
+export declare const prepareTronDepositToSelf: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, options?: PrepareTronDepositOptions) => Promise<TronDepositToSelf>;
+export {};

package/common/src/data-structures/Hinkal/prepareTronDepositToSelf.mjs

@@ -0,0 +1,31 @@
+import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
+import { getCurrentTimeInSeconds as t } from "../../functions/utils/time.utils.mjs";
+import { Utxo as n } from "../utxo/Utxo.mjs";
+import { addressToHexFormat as r } from "../../functions/utils/tron.utils.mjs";
+import { constructZkProof as i } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/prepareTronDepositToSelf.ts
+var a = async (a, o, s, c, l, u = {}) => {
+	let d = s.erc20TokenAddress, f = r(await a.getEthereumAddressByChain(o)), p = t().toString(), m = c.map((e) => e + l.flatFee), h = m.reduce((e, t) => e + t, 0n), g = m.map((e, t) => new n({
+		amount: e,
+		erc20TokenAddress: d,
+		nullifyingKey: a.userKeys.getShieldedPrivateKey(),
+		timeStamp: (BigInt(p) + BigInt(t)).toString(),
+		spendingPublicKey: a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+	})), _ = new n({
+		amount: 0n,
+		erc20TokenAddress: d,
+		nullifyingKey: a.userKeys.getShieldedPrivateKey(),
+		timeStamp: p,
+		spendingPublicKey: a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+	}), v = [[_, _]], y = [g], { zkCallData: b, circomData: x, dimData: S } = await i(a.merkleTreeHinkalByChain[o], v, y, a.userKeys, 0n, f, "0x00", l, e, o, void 0, void 0, void 0, void 0, u.extraData, !0);
+	return {
+		zkCallData: b,
+		circomData: x,
+		dimData: S,
+		utxoAmounts: m,
+		totalDepositAmount: h,
+		depositOutputUtxos: g
+	};
+};
+//#endregion
+export { a as prepareTronDepositToSelf };

package/common/src/data-structures/Hinkal/resetMerkleTrees.cjs

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

package/common/src/data-structures/Hinkal/resetMerkleTrees.mjs

@@ -22,6 +22,7 @@ import { Mutex as v } from "async-mutex";
 //#region libs/shared/common/src/data-structures/Hinkal/resetMerkleTrees.ts
 var y = /* @__PURE__ */ new Map(), b = (e) => a(y, e, () => new v()), x = async (a, v) => {
 	let y = (v ?? a.getSupportedChains()).map((v) => b(v).runExclusive(async () => {
+		if (a.generateProofRemotely) return;
 		a.commitmentsSnapshotServiceByChain[v]?.intervalClear(), a.nullifierSnapshotServiceByChain[v]?.intervalClear();
 		let { maxPageSize: y, fetchRpcUrl: b, contractData: x } = t[v], S;
 		if (e(v)) {

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`../../types/activities.types.cjs`),r=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`),require(`../../error-handling/index.cjs`);const i=require(`../../constants/tx-confirmation.constants.cjs`),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)(r.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(e){let{from:t,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}=e,x=this.generateTxId(),S=m?.length?o.aggregateTokensBySymbol(m):[],C=p?.length?o.aggregateTokensBySymbol(p):[],w={id:x,from:t,to:i,gasInDollar:a?.toString(),extraNativeTokenFee:c?.toString(),chainId:l,txHash:d,activityType:f,status:u??n.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)(r.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,t){let n=await this.getTxRequest(e);if(!n)throw Error(`Activity not found`);let i={...n,txHash:t};await(0,s.update)(r.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=i,t))}async updateTxStatusAndHash(e,t,n){let i=await this.getTxRequest(e);if(!i)throw Error(`Transaction not found`);let a={...i,status:t,txHash:n,timestamp:new Date};return await(0,s.update)(r.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=a,t)),a}async updateActivity(e,n,r){try{await this.updateTxStatusAndHash(e,n,r)}catch(e){t.Logger.error(`error in updating tx request`,e)}}async removePendingTransactions(e){try{await(0,s.update)(r.StorageKeys.TX_ACTIVITY,(t={})=>(delete t[e],t))}catch(e){t.Logger.error(`error in deleting tx requests`,e)}}async updatePendingTransactions(r,o,s,c){try{let t=await this.getTxRequest(o);if(!t)throw Error(`Transaction not found`);let{chainId:l}=t;if(!r.success){c?.(r.error),await this.updateActivity(o,n.ActivityStatus.FAILED,`erroredTx`in r?r.erroredTx:void 0);return}if(`txHash`in r){let{txHash:t}=r;try{await a.waitForTransactionConfirmation(l,t,{evmTimeoutMs:i.RELAYER_TX_CONFIRMATION_TIMEOUT})}catch(r){let i=r instanceof Error?r:Error(e.transactionErrorCodes.UNKNOWN);c?.(i),await this.updateActivity(o,n.ActivityStatus.FAILED,t);return}s?.(),await this.updateActivity(o,n.ActivityStatus.SUCCESSFUL,t)}}catch(e){t.Logger.error(`error in updating pending transactions`,e)}}},l=new c;exports.ActivityStorage=c,exports.activityStorage=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/activities.types.cjs`),n=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);const i=require(`../../constants/tx-confirmation.constants.cjs`),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)(n.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(e){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}=e,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??t.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)(n.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,t){let r=await this.getTxRequest(e);if(!r)throw Error(`Activity not found`);let i={...r,txHash:t};await(0,s.update)(n.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=i,t))}async updateTxStatusAndHash(e,t,r){let i=await this.getTxRequest(e);if(!i)throw Error(`Transaction not found`);let a={...i,status:t,txHash:r,timestamp:new Date};return await(0,s.update)(n.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=a,t)),a}async updateActivity(e,t,n){try{await this.updateTxStatusAndHash(e,t,n)}catch(e){r.Logger.error(`error in updating tx request`,e)}}async removePendingTransactions(e){try{await(0,s.update)(n.StorageKeys.TX_ACTIVITY,(t={})=>(delete t[e],t))}catch(e){r.Logger.error(`error in deleting tx requests`,e)}}async updatePendingTransactions(n,o,s,c){try{let r=await this.getTxRequest(o);if(!r)throw Error(`Transaction not found`);let{chainId:l}=r;if(!n.success){c?.(n.error),await this.updateActivity(o,t.ActivityStatus.FAILED,`erroredTx`in n?n.erroredTx:void 0);return}if(`txHash`in n){let{txHash:r}=n;try{await a.waitForTransactionConfirmation(l,r,{evmTimeoutMs:i.RELAYER_TX_CONFIRMATION_TIMEOUT})}catch(n){let i=n instanceof Error?n:Error(e.transactionErrorCodes.UNKNOWN);c?.(i),await this.updateActivity(o,t.ActivityStatus.FAILED,r);return}s?.(),await this.updateActivity(o,t.ActivityStatus.SUCCESSFUL,r)}}catch(e){r.Logger.error(`error in updating pending transactions`,e)}}},l=new c;exports.ActivityStorage=c,exports.activityStorage=l;

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

@@ -1,8 +1,8 @@
 import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
-import { Logger as t } from "../../error-handling/logger.mjs";
-import { ActivityStatus as n } from "../../types/activities.types.mjs";
-import { StorageKeys as r } from "../../types/cache.types.mjs";
+import { ActivityStatus as t } from "../../types/activities.types.mjs";
+import { StorageKeys as n } from "../../types/cache.types.mjs";
 import "../../types/index.mjs";
+import { Logger as r } from "../../error-handling/logger.mjs";
 import "../../error-handling/index.mjs";
 import { RELAYER_TX_CONFIRMATION_TIMEOUT as i } from "../../constants/tx-confirmation.constants.mjs";
 import { waitForTransactionConfirmation as a } from "../../functions/utils/tx-confirmation.utils.mjs";
@@ -15,19 +15,19 @@ var l = class {
 		return `tx_${(/* @__PURE__ */ new Date()).getTime()}_${Math.random().toString(36).substring(2, 15)}`;
 	}
 	async getTransactionRecord() {
-		return await s(r.TX_ACTIVITY) || {};
+		return await s(n.TX_ACTIVITY) || {};
 	}
 	async saveTxRequest(e) {
-		let { from: t, 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 } = e, x = this.generateTxId(), S = m?.length ? o(m) : [], C = p?.length ? o(p) : [], w = {
+		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 } = e, x = this.generateTxId(), S = m?.length ? o(m) : [], C = p?.length ? o(p) : [], w = {
 			id: x,
-			from: t,
+			from: r,
 			to: i,
 			gasInDollar: a?.toString(),
 			extraNativeTokenFee: s?.toString(),
 			chainId: l,
 			txHash: d,
 			activityType: f,
-			status: u ?? n.PENDING,
+			status: u ?? t.PENDING,
 			timestamp: /* @__PURE__ */ new Date(),
 			tokensReceive: C,
 			tokensSpend: S,
@@ -38,7 +38,7 @@ var l = class {
 			integrationProvider: y,
 			knownPartialSignature: b
 		};
-		return await c(r.TX_ACTIVITY, (e = {}) => (e[x] = w, e)), x;
+		return await c(n.TX_ACTIVITY, (e = {}) => (e[x] = w, e)), x;
 	}
 	async getTxRequest(e) {
 		return (await this.getTransactionRecord())[e] || null;
@@ -48,61 +48,61 @@ var l = class {
 		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, t) {
-		let n = await this.getTxRequest(e);
-		if (!n) throw Error("Activity not found");
+		let r = await this.getTxRequest(e);
+		if (!r) throw Error("Activity not found");
 		let i = {
-			...n,
+			...r,
 			txHash: t
 		};
-		await c(r.TX_ACTIVITY, (t = {}) => (t[e] = i, t));
+		await c(n.TX_ACTIVITY, (t = {}) => (t[e] = i, t));
 	}
-	async updateTxStatusAndHash(e, t, n) {
+	async updateTxStatusAndHash(e, t, r) {
 		let i = await this.getTxRequest(e);
 		if (!i) throw Error("Transaction not found");
 		let a = {
 			...i,
 			status: t,
-			txHash: n,
+			txHash: r,
 			timestamp: /* @__PURE__ */ new Date()
 		};
-		return await c(r.TX_ACTIVITY, (t = {}) => (t[e] = a, t)), a;
+		return await c(n.TX_ACTIVITY, (t = {}) => (t[e] = a, t)), a;
 	}
-	async updateActivity(e, n, r) {
+	async updateActivity(e, t, n) {
 		try {
-			await this.updateTxStatusAndHash(e, n, r);
+			await this.updateTxStatusAndHash(e, t, n);
 		} catch (e) {
-			t.error("error in updating tx request", e);
+			r.error("error in updating tx request", e);
 		}
 	}
 	async removePendingTransactions(e) {
 		try {
-			await c(r.TX_ACTIVITY, (t = {}) => (delete t[e], t));
+			await c(n.TX_ACTIVITY, (t = {}) => (delete t[e], t));
 		} catch (e) {
-			t.error("error in deleting tx requests", e);
+			r.error("error in deleting tx requests", e);
 		}
 	}
-	async updatePendingTransactions(r, o, s, c) {
+	async updatePendingTransactions(n, o, s, c) {
 		try {
-			let t = await this.getTxRequest(o);
-			if (!t) throw Error("Transaction not found");
-			let { chainId: l } = t;
-			if (!r.success) {
-				c?.(r.error), await this.updateActivity(o, n.FAILED, "erroredTx" in r ? r.erroredTx : void 0);
+			let r = await this.getTxRequest(o);
+			if (!r) throw Error("Transaction not found");
+			let { chainId: l } = r;
+			if (!n.success) {
+				c?.(n.error), await this.updateActivity(o, t.FAILED, "erroredTx" in n ? n.erroredTx : void 0);
 				return;
 			}
-			if ("txHash" in r) {
-				let { txHash: t } = r;
+			if ("txHash" in n) {
+				let { txHash: r } = n;
 				try {
-					await a(l, t, { evmTimeoutMs: i });
-				} catch (r) {
-					let i = r instanceof Error ? r : Error(e.UNKNOWN);
-					c?.(i), await this.updateActivity(o, n.FAILED, t);
+					await a(l, r, { evmTimeoutMs: i });
+				} catch (n) {
+					let i = n instanceof Error ? n : Error(e.UNKNOWN);
+					c?.(i), await this.updateActivity(o, t.FAILED, r);
 					return;
 				}
-				s?.(), await this.updateActivity(o, n.SUCCESSFUL, t);
+				s?.(), await this.updateActivity(o, t.SUCCESSFUL, r);
 			}
 		} catch (e) {
-			t.error("error in updating pending transactions", e);
+			r.error("error in updating pending transactions", e);
 		}
 	}
 }, u = new l();

package/common/src/data-structures/IndexedDB/signatures-db.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../error-handling/logger.cjs`),t=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`),require(`../../error-handling/index.cjs`);let n=require(`idb-keyval`);new class{generateMessageId(){return`msg_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async saveSignedMessage(r,i,a,o,s,c){try{let e=this.generateMessageId(),l=await(0,n.get)(t.StorageKeys.SIGNED_MESSAGES)||{},u={chainId:r,messageText:i,messageType:a,subAccountAddress:o,signature:s,appMetaData:c};l[e]={timestamp:new Date().toISOString(),...u},await(0,n.set)(t.StorageKeys.SIGNED_MESSAGES,l)}catch(t){e.Logger.error(`Failed to save signed message:`,t,{chainId:r,messageType:a})}}async getAllSignedMessages(){try{let e=await(0,n.get)(t.StorageKeys.SIGNED_MESSAGES)||{};return Object.values(e).sort((e,t)=>new Date(t.timestamp).getTime()-new Date(e.timestamp).getTime())}catch(t){return e.Logger.error(`Failed to retrieve signed messages:`,t),[]}}};
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const t=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);let n=require(`idb-keyval`);new class{generateMessageId(){return`msg_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async saveSignedMessage(r,i,a,o,s,c){try{let t=this.generateMessageId(),l=await(0,n.get)(e.StorageKeys.SIGNED_MESSAGES)||{},u={chainId:r,messageText:i,messageType:a,subAccountAddress:o,signature:s,appMetaData:c};l[t]={timestamp:new Date().toISOString(),...u},await(0,n.set)(e.StorageKeys.SIGNED_MESSAGES,l)}catch(e){t.Logger.error(`Failed to save signed message:`,e,{chainId:r,messageType:a})}}async getAllSignedMessages(){try{let t=await(0,n.get)(e.StorageKeys.SIGNED_MESSAGES)||{};return Object.values(t).sort((e,t)=>new Date(t.timestamp).getTime()-new Date(e.timestamp).getTime())}catch(e){return t.Logger.error(`Failed to retrieve signed messages:`,e),[]}}};

package/common/src/data-structures/IndexedDB/signatures-db.mjs

@@ -1,6 +1,6 @@
-import { Logger as e } from "../../error-handling/logger.mjs";
-import { StorageKeys as t } from "../../types/cache.types.mjs";
+import { StorageKeys as e } from "../../types/cache.types.mjs";
 import "../../types/index.mjs";
+import { Logger as t } from "../../error-handling/logger.mjs";
 import "../../error-handling/index.mjs";
 import { get as n, set as r } from "idb-keyval";
 new class {
@@ -9,7 +9,7 @@ new class {
 	}
 	async saveSignedMessage(i, a, o, s, c, l) {
 		try {
-			let e = this.generateMessageId(), u = await n(t.SIGNED_MESSAGES) || {}, d = {
+			let t = this.generateMessageId(), u = await n(e.SIGNED_MESSAGES) || {}, d = {
 				chainId: i,
 				messageText: a,
 				messageType: o,
@@ -17,12 +17,12 @@ new class {
 				signature: c,
 				appMetaData: l
 			};
-			u[e] = {
+			u[t] = {
 				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
 				...d
-			}, await r(t.SIGNED_MESSAGES, u);
-		} catch (t) {
-			e.error("Failed to save signed message:", t, {
+			}, await r(e.SIGNED_MESSAGES, u);
+		} catch (e) {
+			t.error("Failed to save signed message:", e, {
 				chainId: i,
 				messageType: o
 			});
@@ -30,10 +30,10 @@ new class {
 	}
 	async getAllSignedMessages() {
 		try {
-			let e = await n(t.SIGNED_MESSAGES) || {};
-			return Object.values(e).sort((e, t) => new Date(t.timestamp).getTime() - new Date(e.timestamp).getTime());
-		} catch (t) {
-			return e.error("Failed to retrieve signed messages:", t), [];
+			let t = await n(e.SIGNED_MESSAGES) || {};
+			return Object.values(t).sort((e, t) => new Date(t.timestamp).getTime() - new Date(e.timestamp).getTime());
+		} catch (e) {
+			return t.error("Failed to retrieve signed messages:", e), [];
 		}
 	}
 }();

package/common/src/data-structures/TokenDBs/AlchemyPublicTokensDB.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../http/HttpClient.cjs`);require(`../http/index.cjs`);const i=require(`../../error-handling/logger.cjs`),a=require(`../../types/cache.types.cjs`),o=require(`../../API/API.cjs`),s=require(`../../functions/utils/string.utils.cjs`),c=require(`./token-visibility-db.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/create-provider.cjs`),d=require(`../../functions/utils/publicBalance.utils.cjs`);let f=require(`@solana/web3.js`),p=require(`idb-keyval`),m=require(`@solana/spl-token`);var h=new class{fetchedTokens={};ALCHEMY_URLS={[e.chainIds.ethMainnet]:`eth-mainnet`,[e.chainIds.polygon]:`polygon-mainnet`,[e.chainIds.arbMainnet]:`arb-mainnet`,[e.chainIds.optimism]:`opt-mainnet`,[e.chainIds.optimismTest]:`opt-mainnet`,[e.chainIds.base]:`base-mainnet`,[e.chainIds.solanaMainnet]:`solana-mainnet`,[e.chainIds.sepoliaTestnet]:`eth-sepolia`};KNOWN_GOOD_NFTS={[e.chainIds.base]:[`0x20bc8d248fe9c18a947406cea50d716828ab821f`],[e.chainIds.optimism]:[`0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e`]};isWhitelistedNFT(e,t){return this.KNOWN_GOOD_NFTS[t]?this.KNOWN_GOOD_NFTS[t].some(t=>n.caseInsensitiveEqual(e,t)):!1}async getPublicTokens(e,t){let n=s.getStateKey(t,e);return l.overlayTokensWithRegistryData((await(0,p.get)(a.StorageKeys.ALCHEMY_PUBLIC_TOKENS))?.[n]||[],e)}async getFetchedTokens(e,t){let n=s.getStateKey(t,e);return l.overlayTokensWithRegistryData(this.fetchedTokens[n]||[],e)}fetchAndUpdatePublicTokens(t,n){return e.isSolanaLike(n)?this.fetchAndUpdateSolanaTokens(t,n):this.fetchAndUpdateEVMTokens(t,n)}async fetchAndUpdateSolanaTokens(e,t){let r=s.getStateKey(e,t),[i,l]=await Promise.all([this.getSolanaTokenAddresses(t,e),this.getNFTAddresses(t,e)]),u=Array.from(new Set([...i,...l]));if(!u.length)return;let d=(await o.API.tokensInfoCall(t,u)).filter(e=>!!e),f=await c.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(t,d),m=d.filter(e=>!n.lowerCaseIncludes(f,e.erc20TokenAddress));await(0,p.update)(a.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[r]:m};return this.fetchedTokens=t,t})}async getWalletTokenAddresses(t,n){return e.isSolanaLike(t)?this.getSolanaTokenAddresses(t,n):this.getEVMTokenAddresses(t,n)}async fetchAndUpdateEVMTokens(e,r){let i=s.getStateKey(e,r),l=await this.getEVMTokenAddresses(r,e),u=await this.getNFTTokens(r,e),d=u.map(e=>e.contractAddress),f=[...l,...d];if(!f.length)return;let m=(await o.API.tokensInfoCall(r,f)).map((e,i)=>{if(e)return e;let a=f[i],o=u.find(e=>n.caseInsensitiveEqual(e.contractAddress,a));return o&&o.tokenIds&&o.tokenIds.length>0&&this.isWhitelistedNFT(a,r)?{chainId:r,name:`Unknown NFT`,symbol:`NFT`,erc20TokenAddress:a,decimals:0,nftTokenType:t.TokenType.ERC721,tokenIds:o.tokenIds}:null}).filter(e=>!!e),h=await c.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(r,m),g=m.filter(e=>!n.lowerCaseIncludes(h,e.erc20TokenAddress)).map(e=>({...e,tokenIds:u.find(t=>n.caseInsensitiveEqual(t.contractAddress,e.erc20TokenAddress))?.tokenIds}));await(0,p.update)(a.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[i]:g};return this.fetchedTokens=t,t})}async getSolanaTokenAddresses(n,r){let{fetchRpcUrl:i}=e.networkRegistry[n];if(!i)throw Error(`RPC URL not found for the specified chain ID`);let a=u.createCustomSolanaConnection(i),o=await a.getBalance(new f.PublicKey(r)),[s,c]=await Promise.all([a.getParsedTokenAccountsByOwner(new f.PublicKey(r),{programId:m.TOKEN_PROGRAM_ID}),a.getParsedTokenAccountsByOwner(new f.PublicKey(r),{programId:m.TOKEN_2022_PROGRAM_ID})]),l=[...s.value,...c.value].filter(e=>{let{amount:t}=e.account.data.parsed.info.tokenAmount;return BigInt(t)>0n}).map(e=>e.account.data.parsed.info.mint);return o>0&&l.unshift(t.solanaNativeAddress),Array.from(new Set(l))}async getNFTAddresses(n,a){let{fetchRpcUrl:o}=e.networkRegistry[n];if(!o)throw Error(`RPC URL not found for the specified chain ID`);try{let e=[],n=1;do{let{items:i=[],page:s}=(await r.httpClient.post(o,{jsonrpc:`2.0`,id:1,method:`getAssetsByOwner`,params:{ownerAddress:a,page:n,limit:1e3,displayOptions:{showFungible:!1,showCollectionMetadata:!0}}})).result||{},c=i.filter(e=>e.interface&&t.SOLANA_NFT_INTERFACES.includes(e.interface)).map(e=>e.id);e.push(...c),n=s&&s>n?s:0}while(n>0);return e}catch(e){return i.Logger.error(`Failed to fetch NFTs from DAS API`,e),[]}}async getEVMTokenAddresses(n,i){let a=await d.getPublicBalanceByTokenAddress(n,i,t.zeroAddress),o=this.ALCHEMY_URLS[n];if(!o)throw Error(`Alchemy URL not found for the specified chain ID: ${n}`);let s=`https://${o}.g.alchemy.com/v2/${e.ALCHEMY_API_KEY}`,c=[],l;do{let e=[i,`erc20`];l&&e.push({pageKey:l});let{result:t}=await r.httpClient.post(s,{jsonrpc:`2.0`,id:1,method:`alchemy_getTokenBalances`,params:e});c.push(...t?.tokenBalances??[]),l=t?.pageKey}while(l);a&&a>0n&&c.push({contractAddress:t.zeroAddress,tokenBalance:a.toString()});let u={};return c.forEach(e=>{(!u[e.contractAddress]||BigInt(e.tokenBalance)>0n)&&(u[e.contractAddress]=e)}),Object.keys(u)}async getNFTTokens(t,n){let i=`https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/nft/v3/${e.ALCHEMY_API_KEY}/getNFTsForOwner`,a=[],o;do{let e=new URLSearchParams({owner:n,withMetadata:`false`,pageSize:`100`});o&&e.append(`pageKey`,o);let{ownedNfts:t=[],pageKey:s}=await r.httpClient.get(`${i}?${e.toString()}`);a.push(...t),o=s}while(o);let s=a.filter(({contractAddress:e,tokenId:t})=>e&&t).reduce((e,{contractAddress:t,tokenId:n})=>{let r=t.toLowerCase();return e.has(r)||e.set(r,[]),e.get(r)?.push(n),e},new Map);return Array.from(s.entries()).map(([e,t])=>({contractAddress:e,tokenIds:t}))}};exports.alchemyPublicTokensDB=h;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../http/HttpClient.cjs`);require(`../http/index.cjs`);const i=require(`../../types/cache.types.cjs`),a=require(`../../API/API.cjs`),o=require(`../../error-handling/logger.cjs`),s=require(`../../functions/utils/string.utils.cjs`),c=require(`./token-visibility-db.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/create-provider.cjs`),d=require(`../../functions/utils/publicBalance.utils.cjs`);let f=require(`@solana/web3.js`),p=require(`idb-keyval`),m=require(`@solana/spl-token`);var h=new class{fetchedTokens={};ALCHEMY_URLS={[e.chainIds.bnbMainnet]:`bnb-mainnet`,[e.chainIds.ethMainnet]:`eth-mainnet`,[e.chainIds.polygon]:`polygon-mainnet`,[e.chainIds.arbMainnet]:`arb-mainnet`,[e.chainIds.optimism]:`opt-mainnet`,[e.chainIds.optimismTest]:`opt-mainnet`,[e.chainIds.base]:`base-mainnet`,[e.chainIds.solanaMainnet]:`solana-mainnet`,[e.chainIds.sepoliaTestnet]:`eth-sepolia`};KNOWN_GOOD_NFTS={[e.chainIds.base]:[`0x20bc8d248fe9c18a947406cea50d716828ab821f`],[e.chainIds.optimism]:[`0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e`]};isWhitelistedNFT(e,t){return this.KNOWN_GOOD_NFTS[t]?this.KNOWN_GOOD_NFTS[t].some(t=>n.caseInsensitiveEqual(e,t)):!1}async getPublicTokens(e,t){let n=s.getStateKey(t,e);return l.overlayTokensWithRegistryData((await(0,p.get)(i.StorageKeys.ALCHEMY_PUBLIC_TOKENS))?.[n]||[],e)}async getFetchedTokens(e,t){let n=s.getStateKey(t,e);return l.overlayTokensWithRegistryData(this.fetchedTokens[n]||[],e)}fetchAndUpdatePublicTokens(t,n){return e.isSolanaLike(n)?this.fetchAndUpdateSolanaTokens(t,n):this.fetchAndUpdateEVMTokens(t,n)}async fetchAndUpdateSolanaTokens(e,t){let r=s.getStateKey(e,t),[o,l]=await Promise.all([this.getSolanaTokenAddresses(t,e),this.getNFTAddresses(t,e)]),u=Array.from(new Set([...o,...l]));if(!u.length)return;let d=(await a.API.tokensInfoCall(t,u)).filter(e=>!!e),f=await c.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(t,d),m=d.filter(e=>!n.lowerCaseIncludes(f,e.erc20TokenAddress));await(0,p.update)(i.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[r]:m};return this.fetchedTokens=t,t})}async getWalletTokenAddresses(t,n){return e.isSolanaLike(t)?this.getSolanaTokenAddresses(t,n):this.getEVMTokenAddresses(t,n)}async fetchAndUpdateEVMTokens(e,r){let o=s.getStateKey(e,r),l=await this.getEVMTokenAddresses(r,e),u=await this.getNFTTokens(r,e),d=u.map(e=>e.contractAddress),f=[...l,...d];if(!f.length)return;let m=(await a.API.tokensInfoCall(r,f)).map((e,i)=>{if(e)return e;let a=f[i],o=u.find(e=>n.caseInsensitiveEqual(e.contractAddress,a));return o&&o.tokenIds&&o.tokenIds.length>0&&this.isWhitelistedNFT(a,r)?{chainId:r,name:`Unknown NFT`,symbol:`NFT`,erc20TokenAddress:a,decimals:0,nftTokenType:t.TokenType.ERC721,tokenIds:o.tokenIds}:null}).filter(e=>!!e),h=await c.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(r,m),g=m.filter(e=>!n.lowerCaseIncludes(h,e.erc20TokenAddress)).map(e=>({...e,tokenIds:u.find(t=>n.caseInsensitiveEqual(t.contractAddress,e.erc20TokenAddress))?.tokenIds}));await(0,p.update)(i.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(e={})=>{let t={...e,[o]:g};return this.fetchedTokens=t,t})}async getSolanaTokenAddresses(n,r){let{fetchRpcUrl:i}=e.networkRegistry[n];if(!i)throw Error(`RPC URL not found for the specified chain ID`);let a=u.createCustomSolanaConnection(i),o=await a.getBalance(new f.PublicKey(r)),[s,c]=await Promise.all([a.getParsedTokenAccountsByOwner(new f.PublicKey(r),{programId:m.TOKEN_PROGRAM_ID}),a.getParsedTokenAccountsByOwner(new f.PublicKey(r),{programId:m.TOKEN_2022_PROGRAM_ID})]),l=[...s.value,...c.value].filter(e=>{let{amount:t}=e.account.data.parsed.info.tokenAmount;return BigInt(t)>0n}).map(e=>e.account.data.parsed.info.mint);return o>0&&l.unshift(t.solanaNativeAddress),Array.from(new Set(l))}async getNFTAddresses(n,i){let{fetchRpcUrl:a}=e.networkRegistry[n];if(!a)throw Error(`RPC URL not found for the specified chain ID`);try{let e=[],n=1;do{let{items:o=[],page:s}=(await r.httpClient.post(a,{jsonrpc:`2.0`,id:1,method:`getAssetsByOwner`,params:{ownerAddress:i,page:n,limit:1e3,displayOptions:{showFungible:!1,showCollectionMetadata:!0}}})).result||{},c=o.filter(e=>e.interface&&t.SOLANA_NFT_INTERFACES.includes(e.interface)).map(e=>e.id);e.push(...c),n=s&&s>n?s:0}while(n>0);return e}catch(e){return o.Logger.error(`Failed to fetch NFTs from DAS API`,e),[]}}async getEVMTokenAddresses(n,i){let a=await d.getPublicBalanceByTokenAddress(n,i,t.zeroAddress),o=this.ALCHEMY_URLS[n];if(!o)throw Error(`Alchemy URL not found for the specified chain ID: ${n}`);let s=`https://${o}.g.alchemy.com/v2/${e.ALCHEMY_API_KEY}`,c=[],l;do{let e=[i,`erc20`];l&&e.push({pageKey:l});let{result:t}=await r.httpClient.post(s,{jsonrpc:`2.0`,id:1,method:`alchemy_getTokenBalances`,params:e});c.push(...t?.tokenBalances??[]),l=t?.pageKey}while(l);a&&a>0n&&c.push({contractAddress:t.zeroAddress,tokenBalance:a.toString()});let u={};return c.forEach(e=>{(!u[e.contractAddress]||BigInt(e.tokenBalance)>0n)&&(u[e.contractAddress]=e)}),Object.keys(u)}async getNFTTokens(t,n){let i=`https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/nft/v3/${e.ALCHEMY_API_KEY}/getNFTsForOwner`,a=[],o;do{let e=new URLSearchParams({owner:n,withMetadata:`false`,pageSize:`100`});o&&e.append(`pageKey`,o);let{ownedNfts:t=[],pageKey:s}=await r.httpClient.get(`${i}?${e.toString()}`);a.push(...t),o=s}while(o);let s=a.filter(({contractAddress:e,tokenId:t})=>e&&t).reduce((e,{contractAddress:t,tokenId:n})=>{let r=t.toLowerCase();return e.has(r)||e.set(r,[]),e.get(r)?.push(n),e},new Map);return Array.from(s.entries()).map(([e,t])=>({contractAddress:e,tokenIds:t}))}};exports.alchemyPublicTokensDB=h;