@hinkal/common 0.2.32 → 0.2.34

package/functions/pre-transaction/sendV0Transaction.mjs

@@ -1,36 +1,40 @@
 import { safeJsonStringify as e } from "../utils/serialize.utils.mjs";
-import { COMPUTE_UNIT_PADDING_PERCENTAGE as t, MAX_COMPUTE_UNIT_LIMIT as n, MIN_COMPUTE_UNIT_LIMIT as r } from "../../constants/protocol.constants.mjs";
-import { AccountActions as i } from "../../data-structures/AccountActions/AccountActions.mjs";
-import { SolanaPriorityFeeMode as a } from "../../types/fee.types.mjs";
-import { getSolanaPriorityFee as o } from "../web3/getSolanaPriorityFee.mjs";
-import { pollForValue as s } from "../utils/process.utils.mjs";
-import { shouldRetryForSolanaError as c } from "../../error-handling/retrySolanaError.mjs";
-import { ComputeBudgetProgram as l, PublicKey as u, TransactionMessage as d, VersionedTransaction as f } from "@solana/web3.js";
-import { ASSOCIATED_TOKEN_PROGRAM_ID as p, TOKEN_PROGRAM_ID as m, createAssociatedTokenAccountInstruction as h, getAssociatedTokenAddress as g } from "@solana/spl-token";
+import { COMPUTE_UNIT_PADDING_PERCENTAGE as t, MAX_COMPUTE_UNIT_LIMIT as n, MAX_SOLANA_HEAP_FRAME_BYTES as r, MIN_COMPUTE_UNIT_LIMIT as i } from "../../constants/protocol.constants.mjs";
+import { AccountActions as a } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { SolanaPriorityFeeMode as o } from "../../types/fee.types.mjs";
+import { getSolanaPriorityFee as s } from "../web3/getSolanaPriorityFee.mjs";
+import { pollForValue as c } from "../utils/process.utils.mjs";
+import { shouldRetryForSolanaError as l } from "../../error-handling/retrySolanaError.mjs";
+import { ComputeBudgetProgram as u, PublicKey as d, TransactionMessage as f, VersionedTransaction as p } from "@solana/web3.js";
+import { ASSOCIATED_TOKEN_PROGRAM_ID as m, TOKEN_PROGRAM_ID as h, createAssociatedTokenAccountInstruction as g, getAssociatedTokenAddress as _ } from "@solana/spl-token";
 //#region libs/shared/common/src/functions/pre-transaction/sendV0Transaction.ts
-var _ = 5e3, v = 6e4, y = 7, b = async (e, t, n = "confirmed") => await s(() => e.getTransaction(t, {
+var v = 5e3, y = 6e4, b = 7, x = async (e, t, n = "confirmed") => await c(() => e.getTransaction(t, {
 	commitment: n,
 	maxSupportedTransactionVersion: 0
 }), {
-	timeoutMs: v,
-	intervalMs: _
-}) ?? null, x = async (e, i, a, o) => {
+	timeoutMs: y,
+	intervalMs: v
+}) ?? null, S = async (e, a, o, s, c = !1) => {
 	try {
-		let { blockhash: s } = await e.getLatestBlockhash(), c = new f(new d({
-			payerKey: i,
-			recentBlockhash: s,
-			instructions: [l.setComputeUnitLimit({ units: n }), ...a]
-		}).compileToV0Message(o)), { unitsConsumed: u } = (await e.simulateTransaction(c, {
+		let { blockhash: l } = await e.getLatestBlockhash(), d = new p(new f({
+			payerKey: a,
+			recentBlockhash: l,
+			instructions: [
+				u.setComputeUnitLimit({ units: n }),
+				...c ? [u.requestHeapFrame({ bytes: r })] : [],
+				...o
+			]
+		}).compileToV0Message(s)), { unitsConsumed: m } = (await e.simulateTransaction(d, {
 			sigVerify: !1,
 			replaceRecentBlockhash: !0
 		})).value;
-		if (!u) return n;
-		let p = Math.ceil(u * (1 + t));
-		return Math.max(r, Math.min(p, n));
+		if (!m) return n;
+		let h = Math.ceil(m * (1 + t));
+		return Math.max(i, Math.min(h, n));
 	} catch {
 		return n;
 	}
-}, S = (e, t, n, r) => {
+}, C = (e, t, n, r) => {
 	let i = /* @__PURE__ */ new Set();
 	return t && i.add(t.toBase58()), n?.forEach((e) => i.add(e.toBase58())), e.forEach((e) => {
 		i.add(e.programId.toBase58()), e.keys.forEach((e) => {
@@ -40,77 +44,78 @@ var _ = 5e3, v = 6e4, y = 7, b = async (e, t, n = "confirmed") => await s(() =>
 		i.add(e.key.toBase58()), e.state.addresses.forEach((e) => {
 			i.add(e.toBase58());
 		});
-	}), [...i].map((e) => new u(e));
-}, C = (t) => {
+	}), [...i].map((e) => new d(e));
+}, w = (t) => {
 	if (!t) throw Error("Failed to fetch Solana transaction details for signature");
 	if (t.meta?.err) {
 		let n = e(t.meta.err);
 		throw Error(`Solana transaction failed on-chain: ${n}`);
 	}
-}, w = async (e, t, r, i, a) => {
-	if (r.some((e) => e.programId.equals(l.programId))) return r.map((e) => e.programId.equals(l.programId) && e.data[0] === 2 ? l.setComputeUnitLimit({ units: n }) : e);
-	let s = r.filter((e) => !e.programId.equals(l.programId)), c = await x(e, t, s, i), u = l.setComputeUnitLimit({ units: c }), d = e.rpcEndpoint.includes("helius") ? await o(S(s, t, [l.programId], i), a) : 0;
+}, T = async (e, t, i, a, o, c = !1) => {
+	if (i.some((e) => e.programId.equals(u.programId))) return i.map((e) => e.programId.equals(u.programId) && e.data[0] === 2 ? u.setComputeUnitLimit({ units: n }) : e);
+	let l = i.filter((e) => !e.programId.equals(u.programId)), d = await S(e, t, l, a, c), f = u.setComputeUnitLimit({ units: d }), p = e.rpcEndpoint.includes("helius") ? await s(C(l, t, [u.programId], a), o) : 0;
 	return [
-		u,
-		l.setComputeUnitPrice({ microLamports: d }),
-		...s
+		f,
+		u.setComputeUnitPrice({ microLamports: p }),
+		...c ? [u.requestHeapFrame({ bytes: r })] : [],
+		...l
 	];
-}, T = async (e, t, n, r, i) => {
+}, E = async (e, t, n, r, i, a = !1) => {
 	if (t.length === 0) return "";
-	for (let o = 0; o < 10; o += 1) {
-		let s = o === 9;
+	for (let s = 0; s < 10; s += 1) {
+		let c = s === 9;
 		try {
-			let s = await w(e, n.publicKey, t, i, o >= y ? a.HIGH : a.RECOMMENDED), { blockhash: c, lastValidBlockHeight: l } = await e.getLatestBlockhash(), u = new f(new d({
+			let c = await T(e, n.publicKey, t, i, s >= b ? o.HIGH : o.RECOMMENDED, a), { blockhash: l, lastValidBlockHeight: u } = await e.getLatestBlockhash(), d = new p(new f({
 				payerKey: n.publicKey,
-				instructions: s,
-				recentBlockhash: c
+				instructions: c,
+				recentBlockhash: l
 			}).compileToV0Message(i));
-			u.sign(r);
-			let p = await e.sendTransaction(u);
+			d.sign(r);
+			let m = await e.sendTransaction(d);
 			return await e.confirmTransaction({
-				signature: p,
-				blockhash: c,
-				lastValidBlockHeight: l
-			}, "confirmed"), C(await b(e, p)), p;
+				signature: m,
+				blockhash: l,
+				lastValidBlockHeight: u
+			}, "confirmed"), w(await x(e, m)), m;
 		} catch (e) {
-			if (c(e) && !s) continue;
+			if (l(e) && !c) continue;
 			throw e;
 		}
 	}
 	return "";
-}, E = async (e, t, n, r) => {
+}, D = async (e, t, n, r) => {
 	if (!n) return null;
-	let i = await g(n, r, !0, m, p);
-	return await e.getAccountInfo(i) || await T(e, [h(t.publicKey, i, r, n, m, p)], t, [t]), i;
-}, D = async ({ connection: e, chainId: t, subAccount: n, payerPublicKey: r, instructions: o, lookupTableAccounts: s }) => {
-	let l = i.getPrivateKeyFromSubAccount(t, n);
-	if (!l) throw Error("Private key is not available");
+	let i = await _(n, r, !0, h, m);
+	return await e.getAccountInfo(i) || await E(e, [g(t.publicKey, i, r, n, h, m)], t, [t]), i;
+}, O = async ({ connection: e, chainId: t, subAccount: n, payerPublicKey: r, instructions: i, lookupTableAccounts: s }) => {
+	let c = a.getPrivateKeyFromSubAccount(t, n);
+	if (!c) throw Error("Private key is not available");
 	for (let t = 0; t < 10; t += 1) {
 		let n = t === 9;
 		try {
-			let t = await w(e, r, o, s, n ? a.HIGH : a.RECOMMENDED), { blockhash: c, lastValidBlockHeight: u } = await e.getLatestBlockhash(), p = new f(new d({
+			let t = await T(e, r, i, s, n ? o.HIGH : o.RECOMMENDED), { blockhash: l, lastValidBlockHeight: u } = await e.getLatestBlockhash(), d = new p(new f({
 				payerKey: r,
-				recentBlockhash: c,
+				recentBlockhash: l,
 				instructions: t
-			}).compileToV0Message(s)), m = await i.sendAndSignSolanaTransactionFromPrivateKey(e, l, p, !0);
+			}).compileToV0Message(s)), m = await a.sendAndSignSolanaTransactionFromPrivateKey(e, c, d, !0);
 			return await e.confirmTransaction({
 				signature: m,
-				blockhash: c,
+				blockhash: l,
 				lastValidBlockHeight: u
-			}, "confirmed"), C(await b(e, m)), m;
+			}, "confirmed"), w(await x(e, m)), m;
 		} catch (e) {
-			if (c(e) && !n) continue;
+			if (l(e) && !n) continue;
 			throw e;
 		}
 	}
 	throw Error("Failed to send proxy v0 transaction due to expired blockheight after all retries");
-}, O = async (e, t, n, r) => {
-	let { blockhash: i } = await e.getLatestBlockhash(), a = new f(new d({
+}, k = async (e, t, n, r) => {
+	let { blockhash: i } = await e.getLatestBlockhash(), a = new p(new f({
 		payerKey: t,
 		recentBlockhash: i,
-		instructions: await w(e, t, n, r)
+		instructions: await T(e, t, n, r)
 	}).compileToV0Message(r));
 	return Buffer.from(a.serialize()).toString("base64");
 };
 //#endregion
-export { E as ensureAtaExists, x as estimateComputeUnitLimit, b as fetchSolanaTransaction, S as getAccountsFromInstructions, D as sendProxyV0Transaction, T as sendV0Transaction, O as serializeProxyV0Transaction };
+export { D as ensureAtaExists, S as estimateComputeUnitLimit, x as fetchSolanaTransaction, C as getAccountsFromInstructions, O as sendProxyV0Transaction, E as sendV0Transaction, k as serializeProxyV0Transaction };

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../web3/etherFunctions.cjs`),ee=require(`../../crypto/poseidon.cjs`),te=require(`../../data-structures/crypto-keys/keys.cjs`),ne=require(`../utils/time.utils.cjs`),i=require(`../utils/bit.operations.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateCircomData.cjs`),l=require(`./generateZkProof.cjs`),u=require(`../../data-structures/AccountActions/AccountActions.cjs`),d=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),f=require(`../private-wallet/emporium.helpers.cjs`);var p=async(p,m,h,g,_,v,y,b,x,S=n.zeroAddress,C=t.chainIds.localhost,w=m.map(()=>!1),T=void 0,E,D)=>{let O=o.getZkProofVerifierName(m,h),k=o.calcAmountChanges(m,h),A=m.map(e=>e[0].erc20TokenAddress),j=o.calcEncryptedOutputs(h),M=n.defaultSignatureData,N=g.getShieldedPrivateKey(),{pubSpendingBJJPoint:P}=g.getSpendingKeyPair(),F=o.calcStealthAddressStructure(te.UserKeys.findCorrectRandomization(r.randomBigInt(31),N),N,g.getSpendingKeyPair().pubSpendingBJJPoint),{inCommitmentSiblings:I,inCommitmentSiblingSides:re,rootHashHinkal:L,inNullifiers:R}=await d.getDataFromWorkers(C,p,m.map(e=>e.map(e=>e.getConstructableParams()))),z=o.buildOutCommitments(h),B=r.randomBigInt(31),V=ee.poseidonFunction(B),H=BigInt(h.length>0?h[0][0].timeStamp:ne.getCurrentTimeInSeconds()),U={rootHashHinkal:L,spendingPublicKey:P,nullifyingPrivateKey:N,erc20TokenAddresses:A,amountChanges:k,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inRandomizations:m.map(e=>e.map(e=>o.getUtxoCircuitInRandomization(e))),inH0Ax:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:m.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inNullifiers:R,inCommitmentSiblings:I,inCommitmentSiblingSides:re,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:H,outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:z,calldataHash:0n,messageSeed:B,H0Ax:i.takeOffHighestBit(F.extraRandomization),H0Ay:F.H0},W=o.calcPublicSignalCount(O,U.erc20TokenAddresses,U.amountChanges,U.inNullifiers,U.outCommitments),G=o.calcAmountChanges(m,h,!0),K=o.getSlippageValues(G);a.Logger.log({publicSignalCount:W});let q=Array.isArray(y)?y:[y],J=t.getOnchainChainId(C),Y=D?u.AccountActions.getSignerAddressFromPrivateKey(J,D):void 0,X=_===e.ExternalActionId.Emporium?await f.encodeEmporiumMetadata(C,v??n.zeroAddress,D,q,V,Y):await f.encodeEmporiumMetadata(C,n.zeroAddress,void 0,_===0n?[]:q,V,n.zeroAddress);U.calldataHash=o.createCallDataHash(W,S,v,_,X,j,T,K,w,x,M,E);let Z=s.computeSignedMessageHashEvm({rootHashHinkal:L,erc20TokenAddresses:A,amountChanges:k,outTimeStamp:H,inNullifiers:R,outCommitments:z,calldataHash:U.calldataHash,message:V,outH1Ay:F.H1,H0Ax:U.H0Ax,H0Ay:F.H0}),{R8:Q,S:ie}=g.signEddsa(Z);U.eddsaSignature=[Q[0],Q[1],ie],U.signedMessageHash=Z;let $=O.startsWith(`mainEVMCircuitMin0`),ae={outTimeStamp:H,calldataHash:U.calldataHash,messageSeed:B},{zkCallData:oe}=await l.generateZkProof(C,O,$?ae:U,b);return{zkCallData:oe,circomData:c.generateCircomData(z,R,L,G,A,h,j,W,_,v,X,S,U.calldataHash,F,w,T,$?Number(H):void 0,K,x,M,E),dimData:{tokenNumber:m.length,nullifierAmount:m.length>0?m[0].length:0,outputAmount:h.length>0?h[0].length:0},encryptedOutputs:j}};exports.constructZkProof=p;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../web3/etherFunctions.cjs`),ee=require(`../../crypto/poseidon.cjs`),te=require(`../../data-structures/crypto-keys/keys.cjs`),ne=require(`../utils/time.utils.cjs`),i=require(`../utils/bit.operations.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateCircomData.cjs`),l=require(`../../data-structures/AccountActions/AccountActions.cjs`),u=require(`./generateMainAndCommitmentZkProof.cjs`),d=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),f=require(`../private-wallet/emporium.helpers.cjs`);var p=async(p,m,h,g,_,v,y,b,x,S=n.zeroAddress,C=t.chainIds.localhost,w=m.map(()=>!1),T=void 0,E,D)=>{let O=o.getZkProofVerifierName(m,h),k=o.calcAmountChanges(m,h),A=m.map(e=>e[0].erc20TokenAddress),j=o.calcEncryptedOutputs(h),M=n.defaultSignatureData,N=g.getShieldedPrivateKey(),{pubSpendingBJJPoint:P}=g.getSpendingKeyPair(),F=o.calcStealthAddressStructure(te.UserKeys.findCorrectRandomization(r.randomBigInt(31),N),N,g.getSpendingKeyPair().pubSpendingBJJPoint),{inCommitmentSiblings:I,inCommitmentSiblingSides:re,rootHashHinkal:L,inNullifiers:R}=await d.getDataFromWorkers(C,p,m.map(e=>e.map(e=>e.getConstructableParams()))),z=o.buildOutCommitments(h),B=r.randomBigInt(31),V=ee.poseidonFunction(B),H=BigInt(h.length>0?h[0][0].timeStamp:ne.getCurrentTimeInSeconds()),U={rootHashHinkal:L,spendingPublicKey:P,nullifyingPrivateKey:N,erc20TokenAddresses:A,amountChanges:k,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inRandomizations:m.map(e=>e.map(e=>o.getUtxoCircuitInRandomization(e))),inH0Ax:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:m.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inNullifiers:R,inCommitmentSiblings:I,inCommitmentSiblingSides:re,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:H,outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:z,calldataHash:0n,messageSeed:B,H0Ax:i.takeOffHighestBit(F.extraRandomization),H0Ay:F.H0},W=o.calcPublicSignalCount(O,U.erc20TokenAddresses,U.amountChanges,U.inNullifiers,U.outCommitments),G=o.calcAmountChanges(m,h,!0),K=o.getSlippageValues(G);a.Logger.log({publicSignalCount:W});let q=Array.isArray(y)?y:[y],J=t.getOnchainChainId(C),Y=D?l.AccountActions.getSignerAddressFromPrivateKey(J,D):void 0,X=_===e.ExternalActionId.Emporium?await f.encodeEmporiumMetadata(C,v??n.zeroAddress,D,q,V,Y):await f.encodeEmporiumMetadata(C,n.zeroAddress,void 0,_===0n?[]:q,V,n.zeroAddress);U.calldataHash=o.createCallDataHash(W,S,v,_,X,j,T,K,w,x,M,E);let Z=s.computeSignedMessageHashEvm({rootHashHinkal:L,erc20TokenAddresses:A,amountChanges:k,outTimeStamp:H,inNullifiers:R,outCommitments:z,calldataHash:U.calldataHash,message:V,outH1Ay:F.H1,H0Ax:U.H0Ax,H0Ay:F.H0}),{R8:Q,S:ie}=g.signEddsa(Z);U.eddsaSignature=[Q[0],Q[1],ie],U.signedMessageHash=Z;let $=O.startsWith(`mainEVMCircuitMin0`),ae={outTimeStamp:H,calldataHash:U.calldataHash,messageSeed:B},{zkCallData:oe,commitmentValidationData:se}=await u.generateMainAndCommitmentZkProof(C,g,A,m,O,$?ae:U,b);return{zkCallData:oe,circomData:c.generateCircomData(z,R,L,G,A,h,j,W,_,v,X,S,U.calldataHash,F,w,T,$?Number(H):void 0,K,x,M,E),dimData:{tokenNumber:m.length,nullifierAmount:m.length>0?m[0].length:0,outputAmount:h.length>0?h[0].length:0},encryptedOutputs:j,commitmentValidationData:se}};exports.constructZkProof=p;

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -9,4 +9,5 @@ export declare const constructZkProof: <T = CircomDataType>(merkleTree: MerkleTr
     circomData: T;
     dimData: DimDataType;
     encryptedOutputs: string[][];
+    commitmentValidationData: import('../..').CommitmentValidationDataType | undefined;
 }>;

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -10,8 +10,8 @@ import { Logger as ie } from "../../error-handling/logger.mjs";
 import { buildOutCommitments as ae, calcAmountChanges as o, calcEncryptedOutputs as s, calcPublicSignalCount as c, calcStealthAddressStructure as l, createCallDataHash as u, getSlippageValues as d, getUtxoCircuitH0Coords as f, getUtxoCircuitInRandomization as oe, getZkProofVerifierName as se } from "./common.snarkjs.mjs";
 import { computeSignedMessageHashEvm as ce } from "./signedMessageHash.mjs";
 import { generateCircomData as le } from "./generateCircomData.mjs";
-import { generateZkProof as ue } from "./generateZkProof.mjs";
-import { AccountActions as de } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { AccountActions as ue } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { generateMainAndCommitmentZkProof as de } from "./generateMainAndCommitmentZkProof.mjs";
 import { getDataFromWorkers as p } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 import { encodeEmporiumMetadata as m } from "../private-wallet/emporium.helpers.mjs";
 //#region libs/shared/common/src/functions/snarkjs/constructGeneralZkProof.ts
@@ -41,7 +41,7 @@ var h = async (h, g, _, v, y, b, x, fe, S, C = i, w = t.localhost, T = g.map(()
 		H0Ay: I.H0
 	}, K = c(k, G.erc20TokenAddresses, G.amountChanges, G.inNullifiers, G.outCommitments), q = o(g, _, !0), J = d(q);
 	ie.log({ publicSignalCount: K });
-	let Y = Array.isArray(x) ? x : [x], pe = n(w), me = O ? de.getSignerAddressFromPrivateKey(pe, O) : void 0, X = y === e.Emporium ? await m(w, b ?? i, O, Y, U, me) : await m(w, i, void 0, y === 0n ? [] : Y, U, i);
+	let Y = Array.isArray(x) ? x : [x], pe = n(w), me = O ? ue.getSignerAddressFromPrivateKey(pe, O) : void 0, X = y === e.Emporium ? await m(w, b ?? i, O, Y, U, me) : await m(w, i, void 0, y === 0n ? [] : Y, U, i);
 	G.calldataHash = u(K, C, b, y, X, M, E, J, T, S, N, D);
 	let Z = ce({
 		rootHashHinkal: z,
@@ -65,7 +65,7 @@ var h = async (h, g, _, v, y, b, x, fe, S, C = i, w = t.localhost, T = g.map(()
 		outTimeStamp: W,
 		calldataHash: G.calldataHash,
 		messageSeed: H
-	}, { zkCallData: _e } = await ue(w, k, $ ? ge : G, fe);
+	}, { zkCallData: _e, commitmentValidationData: ve } = await de(w, v, j, g, k, $ ? ge : G, fe);
 	return {
 		zkCallData: _e,
 		circomData: le(V, B, z, q, j, _, M, K, y, b, X, C, G.calldataHash, I, T, E, $ ? Number(W) : void 0, J, S, N, D),
@@ -74,7 +74,8 @@ var h = async (h, g, _, v, y, b, x, fe, S, C = i, w = t.localhost, T = g.map(()
 			nullifierAmount: g.length > 0 ? g[0].length : 0,
 			outputAmount: _.length > 0 ? _[0].length : 0
 		},
-		encryptedOutputs: M
+		encryptedOutputs: M,
+		commitmentValidationData: ve
 	};
 };
 //#endregion

package/functions/snarkjs/constructSolanaZkProof.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../web3/etherFunctions.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../utils/bit.operations.cjs`),i=require(`../utils/solanaMint.utils.cjs`),a=require(`./common.snarkjs.cjs`),o=require(`../pre-transaction/solana.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateZkProof.cjs`);require(`../pre-transaction/index.cjs`),require(`../utils/index.cjs`);const l=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),u=require(`../pre-transaction/getSolanaCalldataHash.cjs`);require(`../web3/index.cjs`);let d=require(`@solana/web3.js`);var f=async(f,p,m,h,g,_,v,y,b,x,S,C,w,T=e.chainIds.solanaLocalnet,E=[],D=[],O=0n)=>{let k=new d.PublicKey(x),A=new d.PublicKey(S),j=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:M}=m.getSpendingKeyPair(),N=a.calcStealthAddressStructure(v,j,m.getSpendingKeyPair().pubSpendingBJJPoint),P=t.randomBigInt(31),F=n.poseidonFunction(P),I=n.poseidonFunction(O),L=h.map(e=>i.formatMintAddress(e)),R=L.map(e=>e.mintAccountPart1),z=L.map(e=>e.mintAccountPart2),B=u.getSolanaCalldataHash(C,k,A,w,y,b,E,D),V=`${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`,H=a.calcAmountChanges(g,_),{inCommitmentSiblings:U,inCommitmentSiblingSides:W,rootHashHinkal:G,inNullifiers:K}=await l.getDataFromWorkers(T,p,g.map(e=>e.map(e=>e.getConstructableParams()))),q=a.buildOutCommitments(_),J=r.takeOffHighestBit(N.extraRandomization),Y=N.H0,X=s.computeSignedMessageHashSolana({rootHashHinkal:G,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,outTimeStamp:BigInt(_[0][0].timeStamp),inNullifiers:K,outCommitments:q,calldataHash:B,message:F,swapperAccountAdditionalSeed:I,outH1Ay:N.H1,H0Ax:J,H0Ay:Y}),{R8:Z,S:Q}=m.signEddsa(X),$={rootHashHinkal:G,spendingPublicKey:M,eddsaSignature:[Z[0],Z[1],Q],signedMessageHash:X,nullifyingPrivateKey:j,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inRandomizations:g.map(e=>e.map(e=>a.getUtxoCircuitInRandomization(e))),inH0Ax:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:g.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inNullifiers:K,inCommitmentSiblings:U,inCommitmentSiblingSides:W,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:q,calldataHash:B,messageSeed:P,swapperAccountSalt:O,H0Ax:J,H0Ay:Y},{publicSignals:ee,zkCallData:te}=await c.generateZkProof(T,`mainSolanaCircuit${V}`,$,f),[ne,re,ie]=te;return{proofAArr:ne.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:re.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:ie.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:ee.map(BigInt).map(o.encodeToByte32Array)}};exports.constructSolanaZkProof=f;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../web3/etherFunctions.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../utils/bit.operations.cjs`),i=require(`../utils/solanaMint.utils.cjs`),a=require(`./common.snarkjs.cjs`),o=require(`../pre-transaction/solana.cjs`),s=require(`./signedMessageHash.cjs`);require(`../pre-transaction/index.cjs`);const c=require(`./generateMainAndCommitmentZkProof.cjs`);require(`../utils/index.cjs`);const l=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),u=require(`../pre-transaction/getSolanaCalldataHash.cjs`);require(`../web3/index.cjs`);let d=require(`@solana/web3.js`);var f=async(f,p,m,h,g,_,v,y,b,x,S,C,w,T=e.chainIds.solanaLocalnet,E=[],D=[],O=0n)=>{let k=new d.PublicKey(x),A=new d.PublicKey(S),j=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:M}=m.getSpendingKeyPair(),N=a.calcStealthAddressStructure(v,j,m.getSpendingKeyPair().pubSpendingBJJPoint),P=t.randomBigInt(31),F=n.poseidonFunction(P),I=n.poseidonFunction(O),L=h.map(e=>i.formatMintAddress(e)),R=L.map(e=>e.mintAccountPart1),z=L.map(e=>e.mintAccountPart2),B=u.getSolanaCalldataHash(C,k,A,w,y,b,E,D),V=`${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`,H=a.calcAmountChanges(g,_),{inCommitmentSiblings:U,inCommitmentSiblingSides:W,rootHashHinkal:G,inNullifiers:K}=await l.getDataFromWorkers(T,p,g.map(e=>e.map(e=>e.getConstructableParams()))),q=a.buildOutCommitments(_),J=r.takeOffHighestBit(N.extraRandomization),Y=N.H0,X=s.computeSignedMessageHashSolana({rootHashHinkal:G,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,outTimeStamp:BigInt(_[0][0].timeStamp),inNullifiers:K,outCommitments:q,calldataHash:B,message:F,swapperAccountAdditionalSeed:I,outH1Ay:N.H1,H0Ax:J,H0Ay:Y}),{R8:Z,S:Q}=m.signEddsa(X),$={rootHashHinkal:G,spendingPublicKey:M,eddsaSignature:[Z[0],Z[1],Q],signedMessageHash:X,nullifyingPrivateKey:j,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inRandomizations:g.map(e=>e.map(e=>a.getUtxoCircuitInRandomization(e))),inH0Ax:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:g.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inNullifiers:K,inCommitmentSiblings:U,inCommitmentSiblingSides:W,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:q,calldataHash:B,messageSeed:P,swapperAccountSalt:O,H0Ax:J,H0Ay:Y},{zkCallData:ee,publicSignals:te,commitmentValidationData:ne}=await c.generateMainAndCommitmentZkProof(T,m,h,g,`mainSolanaCircuit${V}`,$,f),[re,ie,ae]=ee;return{proofAArr:re.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:ie.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:ae.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:te.map(BigInt).map(o.encodeToByte32Array),commitmentValidationData:ne}};exports.constructSolanaZkProof=f;

package/functions/snarkjs/constructSolanaZkProof.d.ts

@@ -9,4 +9,5 @@ export declare const constructSolanaZkProof: (generateProofRemotely: boolean, me
     proofBArr: number[];
     proofCArr: number[];
     publicInputsArr: number[][];
+    commitmentValidationData: import('../..').CommitmentValidationDataType | undefined;
 }>;

package/functions/snarkjs/constructSolanaZkProof.mjs

@@ -3,69 +3,70 @@ import { randomBigInt as t } from "../web3/etherFunctions.mjs";
 import { poseidonFunction as n } from "../../crypto/poseidon.mjs";
 import { takeOffHighestBit as r } from "../utils/bit.operations.mjs";
 import { formatMintAddress as i } from "../utils/solanaMint.utils.mjs";
-import { buildOutCommitments as a, calcAmountChanges as ee, calcStealthAddressStructure as o, getUtxoCircuitH0Coords as s, getUtxoCircuitInRandomization as c } from "./common.snarkjs.mjs";
-import { encodeToByte32Array as l } from "../pre-transaction/solana.mjs";
-import { computeSignedMessageHashSolana as u } from "./signedMessageHash.mjs";
-import { generateZkProof as d } from "./generateZkProof.mjs";
+import { buildOutCommitments as a, calcAmountChanges as o, calcStealthAddressStructure as s, getUtxoCircuitH0Coords as c, getUtxoCircuitInRandomization as l } from "./common.snarkjs.mjs";
+import { encodeToByte32Array as u } from "../pre-transaction/solana.mjs";
+import { computeSignedMessageHashSolana as d } from "./signedMessageHash.mjs";
 import "../pre-transaction/index.mjs";
+import { generateMainAndCommitmentZkProof as ee } from "./generateMainAndCommitmentZkProof.mjs";
 import "../utils/index.mjs";
 import { getDataFromWorkers as f } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 import { getSolanaCalldataHash as p } from "../pre-transaction/getSolanaCalldataHash.mjs";
 import "../web3/index.mjs";
 import { PublicKey as m } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/snarkjs/constructSolanaZkProof.ts
-var h = async (h, g, _, te, v, y, b, x, S, C, w, T, E, D = e.solanaLocalnet, O = [], k = [], A = 0n) => {
-	let j = new m(C), M = new m(w), N = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: P } = _.getSpendingKeyPair(), F = o(b, N, _.getSpendingKeyPair().pubSpendingBJJPoint), I = t(31), L = n(I), R = n(A), z = te.map((e) => i(e)), B = z.map((e) => e.mintAccountPart1), V = z.map((e) => e.mintAccountPart2), H = p(T, j, M, E, x, S, O, k), U = `${T.tokenNumber}x${T.nullifierAmount}x${T.outputAmount}`, W = ee(v, y), { inCommitmentSiblings: G, inCommitmentSiblingSides: K, rootHashHinkal: q, inNullifiers: J } = await f(D, g, v.map((e) => e.map((e) => e.getConstructableParams()))), Y = a(y), X = r(F.extraRandomization), Z = F.H0, Q = u({
+var h = async (h, g, _, v, y, b, x, S, C, w, T, E, D, O = e.solanaLocalnet, k = [], A = [], j = 0n) => {
+	let M = new m(w), N = new m(T), P = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: F } = _.getSpendingKeyPair(), I = s(x, P, _.getSpendingKeyPair().pubSpendingBJJPoint), L = t(31), R = n(L), z = n(j), B = v.map((e) => i(e)), V = B.map((e) => e.mintAccountPart1), H = B.map((e) => e.mintAccountPart2), U = p(E, M, N, D, S, C, k, A), te = `${E.tokenNumber}x${E.nullifierAmount}x${E.outputAmount}`, W = o(y, b), { inCommitmentSiblings: G, inCommitmentSiblingSides: K, rootHashHinkal: q, inNullifiers: J } = await f(O, g, y.map((e) => e.map((e) => e.getConstructableParams()))), Y = a(b), X = r(I.extraRandomization), Z = I.H0, Q = d({
 		rootHashHinkal: q,
-		mintAccountPart1: B,
-		mintAccountPart2: V,
+		mintAccountPart1: V,
+		mintAccountPart2: H,
 		amountChanges: W,
-		outTimeStamp: BigInt(y[0][0].timeStamp),
+		outTimeStamp: BigInt(b[0][0].timeStamp),
 		inNullifiers: J,
 		outCommitments: Y,
-		calldataHash: H,
-		message: L,
-		swapperAccountAdditionalSeed: R,
-		outH1Ay: F.H1,
+		calldataHash: U,
+		message: R,
+		swapperAccountAdditionalSeed: z,
+		outH1Ay: I.H1,
 		H0Ax: X,
 		H0Ay: Z
 	}), { R8: $, S: ne } = _.signEddsa(Q), re = {
 		rootHashHinkal: q,
-		spendingPublicKey: P,
+		spendingPublicKey: F,
 		eddsaSignature: [
 			$[0],
 			$[1],
 			ne
 		],
 		signedMessageHash: Q,
-		nullifyingPrivateKey: N,
-		mintAccountPart1: B,
-		mintAccountPart2: V,
+		nullifyingPrivateKey: P,
+		mintAccountPart1: V,
+		mintAccountPart2: H,
 		amountChanges: W,
-		inAmounts: v.map((e) => e.map((e) => e.amount.toString())),
-		inRandomizations: v.map((e) => e.map((e) => c(e))),
-		inH0Ax: v.map((e) => e.map((e) => s(e)[0].toString())),
-		inH0Ay: v.map((e) => e.map((e) => s(e)[1].toString())),
-		isNewStyle: v.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: v.map((e) => e.map((e) => e.timeStamp)),
+		inAmounts: y.map((e) => e.map((e) => e.amount.toString())),
+		inRandomizations: y.map((e) => e.map((e) => l(e))),
+		inH0Ax: y.map((e) => e.map((e) => c(e)[0].toString())),
+		inH0Ay: y.map((e) => e.map((e) => c(e)[1].toString())),
+		isNewStyle: y.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: y.map((e) => e.map((e) => e.timeStamp)),
 		inNullifiers: J,
 		inCommitmentSiblings: G,
 		inCommitmentSiblingSides: K,
-		outAmounts: y.map((e) => e.map((e) => e.amount.toString())),
-		outTimeStamp: BigInt(y[0][0].timeStamp),
-		outPublicKeys: y.map((e) => e.map((e) => e.getStealthAddress())),
+		outAmounts: b.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: BigInt(b[0][0].timeStamp),
+		outPublicKeys: b.map((e) => e.map((e) => e.getStealthAddress())),
 		outCommitments: Y,
-		calldataHash: H,
-		messageSeed: I,
-		swapperAccountSalt: A,
+		calldataHash: U,
+		messageSeed: L,
+		swapperAccountSalt: j,
 		H0Ax: X,
 		H0Ay: Z
-	}, { publicSignals: ie, zkCallData: ae } = await d(D, `mainSolanaCircuit${U}`, re, h), [oe, se, ce] = ae;
+	}, { zkCallData: ie, publicSignals: ae, commitmentValidationData: oe } = await ee(O, _, v, y, `mainSolanaCircuit${te}`, re, h), [se, ce, le] = ie;
 	return {
-		proofAArr: oe.map(BigInt).map(l).flat(),
-		proofBArr: se.flat().map(BigInt).map(l).flat(),
-		proofCArr: ce.map(BigInt).map(l).flat(),
-		publicInputsArr: ie.map(BigInt).map(l)
+		proofAArr: se.map(BigInt).map(u).flat(),
+		proofBArr: ce.flat().map(BigInt).map(u).flat(),
+		proofCArr: le.map(BigInt).map(u).flat(),
+		publicInputsArr: ae.map(BigInt).map(u),
+		commitmentValidationData: oe
 	};
 };
 //#endregion

package/functions/snarkjs/generateMainAndCommitmentZkProof.cjs

@@ -0,0 +1 @@
+const e=require(`../pre-transaction/buildCommitmentValidationData.cjs`);require(`../pre-transaction/index.cjs`);const t=require(`./generateZkProof.cjs`);var n=async(n,r,i,a,o,s,c)=>{let l=await e.buildCommitmentValidationData(n,r,i,a),u=[o],d=[s];l&&(u.push(l.verifierName),d.push(l.commitmentInput));let f=await t.generateZkProof(n,u,d,c),{zkCallData:p,publicSignals:m}=f[0];return{zkCallData:p,publicSignals:m,commitmentValidationData:e.buildCommitmentValidationDataFromProof(l,f[1])}};exports.generateMainAndCommitmentZkProof=n;

package/functions/snarkjs/generateMainAndCommitmentZkProof.d.ts

@@ -0,0 +1,11 @@
+import { UserKeys } from '../../data-structures/crypto-keys/keys';
+import { Utxo } from '../../data-structures/utxo/Utxo';
+import { CommitmentValidationDataType } from '../../types/circom-data.types';
+import { NewZkCallDataType } from '../../types/snark.types';
+interface GenerateMainAndCommitmentZkProofResponse {
+    zkCallData: NewZkCallDataType;
+    publicSignals: string[];
+    commitmentValidationData: CommitmentValidationDataType | undefined;
+}
+export declare const generateMainAndCommitmentZkProof: (chainId: number, userKeys: UserKeys, tokenAddresses: string[], inputUtxos: Utxo[][], mainVerifierName: string, mainCircuitInput: unknown, generateProofRemotely: boolean) => Promise<GenerateMainAndCommitmentZkProofResponse>;
+export {};

package/functions/snarkjs/generateMainAndCommitmentZkProof.mjs

@@ -0,0 +1,16 @@
+import { buildCommitmentValidationData as e, buildCommitmentValidationDataFromProof as t } from "../pre-transaction/buildCommitmentValidationData.mjs";
+import "../pre-transaction/index.mjs";
+import { generateZkProof as n } from "./generateZkProof.mjs";
+//#region libs/shared/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.ts
+var r = async (r, i, a, o, s, c, l) => {
+	let u = await e(r, i, a, o), d = [s], f = [c];
+	u && (d.push(u.verifierName), f.push(u.commitmentInput));
+	let p = await n(r, d, f, l), { zkCallData: m, publicSignals: h } = p[0];
+	return {
+		zkCallData: m,
+		publicSignals: h,
+		commitmentValidationData: t(u, p[1])
+	};
+};
+//#endregion
+export { r as generateMainAndCommitmentZkProof };

package/functions/snarkjs/generateZkProof.cjs

@@ -1 +1 @@
-const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{if(c)try{let t=e.getCustomProofGenerator();if(t){let{zkCallData:e,publicSignals:r}=await t(s,n.getWASMFile(o,a),n.getZKeyFile(o,a));return{zkCallData:e,publicSignals:r}}return await r.generateZkProofEnclave(a,o,s)}catch(e){t.Logger.error(`enclave proof error`,e)}return i.generateZkProofSelf(a,o,s)};exports.generateZkProof=a;
+const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{if(c)try{let t=e.getCustomProofGenerator();return t?(await t(s,o.map(e=>n.getWASMFile(e,a)),o.map(e=>n.getZKeyFile(e,a)))).map(({zkCallData:e,publicSignals:t})=>({zkCallData:e,publicSignals:t})):await r.generateZkProofEnclave(a,o,s)}catch(e){t.Logger.error(`enclave proof error`,e)}return Promise.all(o.map((e,t)=>i.generateZkProofSelf(a,e,s[t])))};exports.generateZkProof=a;

package/functions/snarkjs/generateZkProof.d.ts

@@ -1,5 +1,5 @@
-import { NewZkCallDataType } from '../../types';
-export declare const generateZkProof: (chainId: number, verifierName: string, input: any, remotely?: boolean) => Promise<{
+import { NewZkCallDataType } from '../../types/snark.types';
+export declare const generateZkProof: (chainId: number, verifierNames: string[], inputs: any[], remotely?: boolean) => Promise<{
     zkCallData: NewZkCallDataType;
     publicSignals: string[];
-}>;
+}[]>;

package/functions/snarkjs/generateZkProof.mjs

@@ -7,18 +7,14 @@ import { generateZkProofSelf as a } from "./generateZkProofSelf.mjs";
 var o = async (o, s, c, l) => {
 	if (l) try {
 		let t = e();
-		if (t) {
-			let { zkCallData: e, publicSignals: i } = await t(c, n(s, o), r(s, o));
-			return {
-				zkCallData: e,
-				publicSignals: i
-			};
-		}
-		return await i(o, s, c);
+		return t ? (await t(c, s.map((e) => n(e, o)), s.map((e) => r(e, o)))).map(({ zkCallData: e, publicSignals: t }) => ({
+			zkCallData: e,
+			publicSignals: t
+		})) : await i(o, s, c);
 	} catch (e) {
 		t.error("enclave proof error", e);
 	}
-	return a(o, s, c);
+	return Promise.all(s.map((e, t) => a(o, e, c[t])));
 };
 //#endregion
 export { o as generateZkProof };

package/functions/snarkjs/generateZkProofEnclave.cjs

@@ -1 +1 @@
-const e=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const t=require(`./constant.cjs`),n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./getZKFiles.cjs`);var i=e=>{if(e.startsWith(`http`)){let t=e.split(`/`).at(-1);if(!t)throw Error(`invalid verifierName`);return t}return e},a=async(a,o,s)=>{let c=i(r.getWASMFile(o,a)),l=i(r.getZKeyFile(o,a)),{keyCiphertext:u,inputCiphertext:d}=await n.makeEnclaveHandshakeAndEncryptInput(s),f={circuit_wasm:c,circuit_zkey:l,input:d,key:u},{public_signals:p,zk_calldata:m}=await e.httpClient.post(`${t.ENCLAVE_URL}/generate`,f);return{zkCallData:m,publicSignals:p}};exports.generateZkProofEnclave=a;
+const e=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const t=require(`./constant.cjs`),n=require(`../utils/encryptInputForEnclave.cjs`),r=require(`./getZKFiles.cjs`);var i=e=>{if(e.startsWith(`http`)){let t=e.split(`/`).at(-1);if(!t)throw Error(`invalid verifierName`);return t}return e},a=async(a,o,s)=>{let c=o.map(e=>i(r.getWASMFile(e,a))),l=o.map(e=>i(r.getZKeyFile(e,a))),{keyCiphertext:u,inputCiphertext:d}=await n.makeEnclaveHandshakeAndEncryptInput(s),f={circuit_wasms:c,circuit_zkeys:l,inputs:d,key:u};return(await e.httpClient.post(`${t.ENCLAVE_URL}/generate-proofs`,f)).map(({zk_calldata:e,public_signals:t})=>({zkCallData:e,publicSignals:t}))};exports.generateZkProofEnclave=a;

package/functions/snarkjs/generateZkProofEnclave.d.ts

@@ -1,5 +1,5 @@
 import { NewZkCallDataType } from '../../types/snark.types';
-export declare const generateZkProofEnclave: (chainId: number, verifierName: string, input: any) => Promise<{
+export declare const generateZkProofEnclave: (chainId: number, verifierNames: string[], inputs: any[]) => Promise<{
     zkCallData: NewZkCallDataType;
     publicSignals: string[];
-}>;
+}[]>;

package/functions/snarkjs/generateZkProofEnclave.mjs

@@ -12,16 +12,16 @@ var a = (e) => {
 	}
 	return e;
 }, o = async (o, s, c) => {
-	let l = a(r(s, o)), u = a(i(s, o)), { keyCiphertext: d, inputCiphertext: f } = await n(c), p = {
-		circuit_wasm: l,
-		circuit_zkey: u,
-		input: f,
+	let l = s.map((e) => a(r(e, o))), u = s.map((e) => a(i(e, o))), { keyCiphertext: d, inputCiphertext: f } = await n(c), p = {
+		circuit_wasms: l,
+		circuit_zkeys: u,
+		inputs: f,
 		key: d
-	}, { public_signals: m, zk_calldata: h } = await e.post(`${t}/generate`, p);
-	return {
-		zkCallData: h,
-		publicSignals: m
 	};
+	return (await e.post(`${t}/generate-proofs`, p)).map(({ zk_calldata: e, public_signals: t }) => ({
+		zkCallData: e,
+		publicSignals: t
+	}));
 };
 //#endregion
 export { o as generateZkProofEnclave };

package/functions/snarkjs/generateZkProofSelf.cjs

@@ -1 +1 @@
-const e=require(`./getZKFiles.cjs`),t=require(`../../webworker/worker.registry.cjs`),n=require(`../../webworker/performTaskWithWorker.cjs`),r=require(`../../webworker/snarkjsWorker/snarkjsWorker.types.cjs`);var i=async(i,a,o)=>{let s=e.getWASMFile(a,i),c=e.getZKeyFile(a,i),{publicSignals:l,zkCallData:u}=await n.performTaskWithWorker({type:t.WorkerVariant.SnarkJS,payload:{type:r.SnarkJSWorkerActionType.FULL_PROVE,data:{input:o,chainId:i,wasmFilePath:s,zKeyFilePath:c}}});return{zkCallData:u,publicSignals:l}};exports.generateZkProofSelf=i;
+const e=require(`../../webworker/worker.registry.cjs`),t=require(`../../webworker/performTaskWithWorker.cjs`),n=require(`./getZKFiles.cjs`),r=require(`../../webworker/snarkjsWorker/snarkjsWorker.types.cjs`);var i=async(i,a,o)=>{let s=n.getWASMFile(a,i),c=n.getZKeyFile(a,i),{publicSignals:l,zkCallData:u}=await t.performTaskWithWorker({type:e.WorkerVariant.SnarkJS,payload:{type:r.SnarkJSWorkerActionType.FULL_PROVE,data:{input:o,chainId:i,wasmFilePath:s,zKeyFilePath:c}}});return{zkCallData:u,publicSignals:l}};exports.generateZkProofSelf=i;

package/functions/snarkjs/generateZkProofSelf.mjs

@@ -1,11 +1,11 @@
-import { getWASMFile as e, getZKeyFile as t } from "./getZKFiles.mjs";
-import { WorkerVariant as n } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as r } from "../../webworker/performTaskWithWorker.mjs";
+import { WorkerVariant as e } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as t } from "../../webworker/performTaskWithWorker.mjs";
+import { getWASMFile as n, getZKeyFile as r } from "./getZKFiles.mjs";
 import { SnarkJSWorkerActionType as i } from "../../webworker/snarkjsWorker/snarkjsWorker.types.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProofSelf.ts
 var a = async (a, o, s) => {
-	let c = e(o, a), l = t(o, a), { publicSignals: u, zkCallData: d } = await r({
-		type: n.SnarkJS,
+	let c = n(o, a), l = r(o, a), { publicSignals: u, zkCallData: d } = await t({
+		type: e.SnarkJS,
 		payload: {
 			type: i.FULL_PROVE,
 			data: {

package/functions/snarkjs/index.cjs

@@ -1 +1 @@
-require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`);
+require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./generateMainAndCommitmentZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`);

package/functions/snarkjs/index.d.ts

@@ -2,6 +2,7 @@ export * from './constructGeneralZkProof';
 export * from './common.snarkjs';
 export * from './signedMessageHash';
 export * from './generateZkProof';
+export * from './generateMainAndCommitmentZkProof';
 export * from './constructSolanaZkProof';
 export * from './fetchOnChainRootHashes';
 export * from './verifyCommitmentValidationData';

package/functions/snarkjs/index.mjs

@@ -1,6 +1,7 @@
 import "./common.snarkjs.mjs";
 import "./signedMessageHash.mjs";
 import "./generateZkProof.mjs";
+import "./generateMainAndCommitmentZkProof.mjs";
 import "./fetchOnChainRootHashes.mjs";
 import "./constructGeneralZkProof.mjs";
 import "./constructSolanaZkProof.mjs";

package/functions/snarkjs/verifyCommitmentValidationData.cjs

@@ -1 +1 @@
-const e=require(`../../_virtual/_rolldown/runtime.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`../utils/bytes32.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`./getZKFiles.cjs`),a=require(`../pre-transaction/solana-public-signals.cjs`);let o=require(`ethers`),s=require(`snarkjs`);s=e.__toESM(s);var c=e=>e.flat().map(e=>BigInt(e).toString()),l=(e,t)=>{let n=t.inNullifiers[0]?.length??0;return i.getVKFile(`commitmentCalculator${t.tokenAddresses.length}x${n}`,e)},u=async(e,n)=>{let r=l(e,n);return t.httpClient.get(r)},d=e=>({pi_a:[...e.a],pi_b:[[e.b[0][1],e.b[0][0]],[e.b[1][1],e.b[1][0]]],pi_c:[...e.c],protocol:`groth16`}),f=e=>{let t=e.tokenAddresses.map(e=>o.ethers.getBigInt(e).toString()),n=c(e.inCommitments),r=c(e.inNullifiers);return[...t,...n,...r]},p=async(e,t,n)=>{if(c(t.inNullifiers).join(`,`)!==n.join(`,`))throw Error(`commitmentValidationData.inNullifiers mismatch with request input`);let r=await u(e,t),i=f(t),a=d(t.proof);if(!await s.groth16.verify(r,i,a))throw Error(`Invalid commitment validation proof`)},m=async e=>{let t=e.commitmentValidationData;if(!t)return;let n=c(r.deserializeCircomData(e.circomData).inputNullifiers);await p(e.chainId,t,n)},h=async e=>{let t=e.commitmentValidationData;if(!t)return;let r=a.convertSolanaPublicSignals(e.args.publicInputsArr,e.args.dimensions).inNullifiers.flat().map(e=>n.convertBytes32ToBigInt(e).toString());await p(e.chainId,t,r)};exports.verifyCommitmentValidationData=m,exports.verifyCommitmentValidationDataSolana=h;
+const e=require(`../../_virtual/_rolldown/runtime.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`../utils/bytes32.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`../pre-transaction/solana-public-signals.cjs`),a=require(`./getZKFiles.cjs`);let o=require(`ethers`),s=require(`snarkjs`);s=e.__toESM(s);var c=e=>e.flat().map(e=>BigInt(e).toString()),l=(e,t)=>{let n=t.inNullifiers[0]?.length??0;return a.getVKFile(`commitmentCalculator${t.tokenAddresses.length}x${n}`,e)},u=async(e,n)=>{let r=l(e,n);return t.httpClient.get(r)},d=e=>({pi_a:[...e.a],pi_b:[[e.b[0][1],e.b[0][0]],[e.b[1][1],e.b[1][0]]],pi_c:[...e.c],protocol:`groth16`}),f=e=>{let t=e.tokenAddresses.map(e=>o.ethers.getBigInt(e).toString()),n=c(e.inCommitments),r=c(e.inNullifiers);return[...t,...n,...r]},p=async(e,t,n)=>{if(c(t.inNullifiers).join(`,`)!==n.join(`,`))throw Error(`commitmentValidationData.inNullifiers mismatch with request input`);let r=await u(e,t),i=f(t),a=d(t.proof);if(!await s.groth16.verify(r,i,a))throw Error(`Invalid commitment validation proof`)},m=async e=>{let t=e.commitmentValidationData;if(!t)return;let n=c(r.deserializeCircomData(e.circomData).inputNullifiers);await p(e.chainId,t,n)},h=async e=>{let t=e.commitmentValidationData;if(!t)return;let r=i.convertSolanaPublicSignals(e.args.publicInputsArr,e.args.dimensions).inNullifiers.flat().map(e=>n.convertBytes32ToBigInt(e).toString());await p(e.chainId,t,r)};exports.verifyCommitmentValidationData=m,exports.verifyCommitmentValidationDataSolana=h;

package/functions/snarkjs/verifyCommitmentValidationData.mjs

@@ -1,14 +1,14 @@
 import { httpClient as e } from "../../data-structures/http/HttpClient.mjs";
 import { convertBytes32ToBigInt as t } from "../utils/bytes32.utils.mjs";
 import { deserializeCircomData as n } from "./common.snarkjs.mjs";
-import { getVKFile as r } from "./getZKFiles.mjs";
-import { convertSolanaPublicSignals as i } from "../pre-transaction/solana-public-signals.mjs";
+import { convertSolanaPublicSignals as r } from "../pre-transaction/solana-public-signals.mjs";
+import { getVKFile as i } from "./getZKFiles.mjs";
 import { ethers as a } from "ethers";
 import * as o from "snarkjs";
 //#region libs/shared/common/src/functions/snarkjs/verifyCommitmentValidationData.ts
 var s = (e) => e.flat().map((e) => BigInt(e).toString()), c = (e, t) => {
 	let n = t.inNullifiers[0]?.length ?? 0;
-	return r(`commitmentCalculator${t.tokenAddresses.length}x${n}`, e);
+	return i(`commitmentCalculator${t.tokenAddresses.length}x${n}`, e);
 }, l = async (t, n) => {
 	let r = c(t, n);
 	return e.get(r);
@@ -36,8 +36,8 @@ var s = (e) => e.flat().map((e) => BigInt(e).toString()), c = (e, t) => {
 }, m = async (e) => {
 	let n = e.commitmentValidationData;
 	if (!n) return;
-	let r = i(e.args.publicInputsArr, e.args.dimensions).inNullifiers.flat().map((e) => t(e).toString());
-	await f(e.chainId, n, r);
+	let i = r(e.args.publicInputsArr, e.args.dimensions).inNullifiers.flat().map((e) => t(e).toString());
+	await f(e.chainId, n, i);
 };
 //#endregion
 export { p as verifyCommitmentValidationData, m as verifyCommitmentValidationDataSolana };

package/functions/utils/customEnclaveFunctionsRegister.d.ts

@@ -1,12 +1,12 @@
-import { NewZkCallDataType } from '../../types/snark.types';
 import { RemoteProofType } from '../../types/remote-proof.types';
 import { EncryptedOutputWithSign } from '../../types/commitments.types';
 import { IUtxoConstructor } from '../../data-structures/utxo/Utxo';
-export type ProofGeneratorFn = (input: any, circuitWasm: string, circuitZkey: string) => Promise<{
+import { NewZkCallDataType } from '../../types/snark.types';
+export type ProofGeneratorFn = (inputs: any[], circuitWasmFilenames: string[], circuitZkeyFilenames: string[]) => Promise<{
     proof: RemoteProofType;
     publicSignals: string[];
     zkCallData: NewZkCallDataType;
-}>;
+}[]>;
 export type UtxoDecryptorFn = (chainId: number, keysData: Uint8Array) => Promise<{
     utxos: IUtxoConstructor<string>[];
     encryptedOutputs: EncryptedOutputWithSign[];