@gurge/sdk 0.3.22 → 0.3.24

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),v=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var y=async(e,t,n,r)=>{let a=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},b=async(i,c,l,b,x,S,C,w)=>{let T=s.validateAndGetChainId(c),E=e.isTronLike(T),D=o.addressToHexFormat(await i.getEthereumAddressByChain(T)),O=c.map(e=>e.erc20TokenAddress),k=await u.modifyVolatileTokenAmountChanges(T,c,l),A=c[0];if(!A)throw Error(`Deposit Action: No Token Found`);let j;if(!x){let e=C??await f.getFeeStructure(T,S,O,a.ExternalActionId.Transact);j=await p.calculateModifiedFeeStructure(T,A,-k[0],e),await v.mergeWithFeeStructure(T,O,k,j)}let M={externalActionId:0n,externalAddress:o.addressToHexFormat(b),externalActionMetadata:`0x00`},[N,{inputUtxosArray:P,outputUtxosArray:F}]=await Promise.all([i.getRandomRelay(T,!0),y(i,T,O,k)]);if(!x&&!N)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:I,circomData:L,dimData:R,commitmentValidationData:z}=await m.constructZkProof(i.merkleTreeHinkalByChain[T],P,F,i.userKeys,M.externalActionId,M.externalAddress,M.externalActionMetadata,i.generateProofRemotely,j??n.zeroFeeStructure,x?t.zeroAddress:N,T,void 0,void 0,x?D:void 0),B=E&&x?void 0:await o.reorderZkCallData(E,I,R,L);if(x){if(!A)throw Error(`Withdraw Action: No Token Found`);return E?await _.transactCallDirectTron(i,T,k[0],A,I,L,R):await h.transactCallDirect(i,T,k[0],A,I,L,R)}return await g.transactCallRelayer(T,I,R,L,z,void 0,void 0,d.constructAdminData(w,T,O,k,D),B)};exports.hinkalWithdraw=b;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/utils/hinkalTiming.utils.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let a=o.createHinkalTiming(`withdraw.utxos`),s=[...await l.addPaddingToUtxos(e,t,n,r)];a.log(`addPaddingToUtxos`,{inputCount:s[0]?.length});let c=[],d=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,s[t],r[t],d);c.push(n)}return a.log(`outputUtxoProcessing`),{inputUtxosArray:s,outputUtxosArray:c}},x=async(i,l,u,x,S,C,w,T)=>{let E=o.createHinkalTiming(`withdraw`),D=c.validateAndGetChainId(l),O=e.isTronLike(D);E.log(`start`,{chainId:D,isRelayerOff:S,tokenCount:l.length});let k=s.addressToHexFormat(await i.getEthereumAddressByChain(D));E.log(`getEthereumAddress`);let A=l.map(e=>e.erc20TokenAddress),j=await d.modifyVolatileTokenAmountChanges(D,l,u);E.log(`modifyVolatileTokenAmountChanges`);let M=l[0];if(!M)throw Error(`Deposit Action: No Token Found`);let N;if(!S){let e=w??await p.getFeeStructure(D,C,A,a.ExternalActionId.Transact);N=await m.calculateModifiedFeeStructure(D,M,-j[0],e),await y.mergeWithFeeStructure(D,A,j,N),E.log(`feeStructure`,{feeToken:C})}let P={externalActionId:0n,externalAddress:s.addressToHexFormat(x),externalActionMetadata:`0x00`},[F,{inputUtxosArray:I,outputUtxosArray:L}]=await Promise.all([(async()=>{let e=o.createHinkalTiming(`withdraw.relay`),t=await i.getRandomRelay(D,!0);return e.log(`getRandomRelay`,{hasRelay:!!t}),t})(),b(i,D,A,j)]);if(E.log(`relay+utxos`,{hasRelay:!!F}),!S&&!F)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:R,circomData:z,dimData:B,commitmentValidationData:V}=await h.constructZkProof(i.merkleTreeHinkalByChain[D],I,L,i.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,i.generateProofRemotely,N??n.zeroFeeStructure,S?t.zeroAddress:F,D,void 0,void 0,S?k:void 0);E.log(`constructZkProof`,{generateProofRemotely:i.generateProofRemotely});let H=O&&S?void 0:await s.reorderZkCallData(O,R,B,z);if(E.log(`reorderZkCallData`),S){if(!M)throw Error(`Withdraw Action: No Token Found`);if(O){let e=await v.transactCallDirectTron(i,D,j[0],M,R,z,B);return E.log(`transactCallDirectTron`,{txid:e}),E.log(`done`),e}let e=await g.transactCallDirect(i,D,j[0],M,R,z,B);return E.log(`transactCallDirect`,{txHash:e.hash}),E.log(`done`),e}let U=await _.transactCallRelayer(D,R,B,z,V,void 0,void 0,f.constructAdminData(T,D,A,j,k),H);return E.log(`transactCallRelayer`,{txHash:U}),E.log(`done`),U};exports.hinkalWithdraw=x;

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

@@ -4,51 +4,75 @@ import { zeroFeeStructure as n } from "../../types/hinkal.types.mjs";
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
 import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
 import { ExternalActionId as a } from "../../types/external-action.types.mjs";
-import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { modifyVolatileTokenAmountChanges as d } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { createHinkalTiming as o } from "../../functions/utils/hinkalTiming.utils.mjs";
+import { addressToHexFormat as s, reorderZkCallData as c } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { modifyVolatileTokenAmountChanges as f } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as g } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactCallDirectTron as v } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { mergeWithFeeStructure as y } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { calculateModifiedFeeStructure as h } from "../../functions/utils/fees.utils.mjs";
+import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallDirect as _ } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { transactCallDirectTron as y } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
-var b = async (e, t, n, r) => {
-	let a = [...await l(e, t, n, r)], o = [], s = i().toString();
+var x = async (e, t, n, r) => {
+	let a = o("withdraw.utxos"), s = [...await u(e, t, n, r)];
+	a.log("addPaddingToUtxos", { inputCount: s[0]?.length });
+	let c = [], l = i().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = u(e.userKeys, a[t], r[t], s);
-		o.push(n);
+		let { outputUtxos: n } = d(e.userKeys, s[t], r[t], l);
+		c.push(n);
 	}
-	return {
-		inputUtxosArray: a,
-		outputUtxosArray: o
+	return a.log("outputUtxoProcessing"), {
+		inputUtxosArray: s,
+		outputUtxosArray: c
 	};
-}, x = async (i, l, u, x, S, C, w, T) => {
-	let E = c(l), D = e(E), O = o(await i.getEthereumAddressByChain(E)), k = l.map((e) => e.erc20TokenAddress), A = await d(E, l, u), j = l[0];
-	if (!j) throw Error("Deposit Action: No Token Found");
-	let M;
-	if (!S) {
-		let e = w ?? await p(E, C, k, a.Transact);
-		M = await m(E, j, -A[0], e), await y(E, k, A, M);
+}, S = async (i, u, d, S, C, w, T, E) => {
+	let D = o("withdraw"), O = l(u), k = e(O);
+	D.log("start", {
+		chainId: O,
+		isRelayerOff: C,
+		tokenCount: u.length
+	});
+	let A = s(await i.getEthereumAddressByChain(O));
+	D.log("getEthereumAddress");
+	let j = u.map((e) => e.erc20TokenAddress), M = await f(O, u, d);
+	D.log("modifyVolatileTokenAmountChanges");
+	let N = u[0];
+	if (!N) throw Error("Deposit Action: No Token Found");
+	let P;
+	if (!C) {
+		let e = T ?? await m(O, w, j, a.Transact);
+		P = await h(O, N, -M[0], e), await b(O, j, M, P), D.log("feeStructure", { feeToken: w });
 	}
-	let N = {
+	let F = {
 		externalActionId: 0n,
-		externalAddress: o(x),
+		externalAddress: s(S),
 		externalActionMetadata: "0x00"
-	}, [P, { inputUtxosArray: F, outputUtxosArray: I }] = await Promise.all([i.getRandomRelay(E, !0), b(i, E, k, A)]);
-	if (!S && !P) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await h(i.merkleTreeHinkalByChain[E], F, I, i.userKeys, N.externalActionId, N.externalAddress, N.externalActionMetadata, i.generateProofRemotely, M ?? n, S ? t : P, E, void 0, void 0, S ? O : void 0), V = D && S ? void 0 : await s(D, L, z, R);
-	if (S) {
-		if (!j) throw Error("Withdraw Action: No Token Found");
-		return D ? await v(i, E, A[0], j, L, R, z) : await g(i, E, A[0], j, L, R, z);
+	}, [I, { inputUtxosArray: L, outputUtxosArray: R }] = await Promise.all([(async () => {
+		let e = o("withdraw.relay"), t = await i.getRandomRelay(O, !0);
+		return e.log("getRandomRelay", { hasRelay: !!t }), t;
+	})(), x(i, O, j, M)]);
+	if (D.log("relay+utxos", { hasRelay: !!I }), !C && !I) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let { zkCallData: z, circomData: B, dimData: V, commitmentValidationData: H } = await g(i.merkleTreeHinkalByChain[O], L, R, i.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, i.generateProofRemotely, P ?? n, C ? t : I, O, void 0, void 0, C ? A : void 0);
+	D.log("constructZkProof", { generateProofRemotely: i.generateProofRemotely });
+	let U = k && C ? void 0 : await c(k, z, V, B);
+	if (D.log("reorderZkCallData"), C) {
+		if (!N) throw Error("Withdraw Action: No Token Found");
+		if (k) {
+			let e = await y(i, O, M[0], N, z, B, V);
+			return D.log("transactCallDirectTron", { txid: e }), D.log("done"), e;
+		}
+		let e = await _(i, O, M[0], N, z, B, V);
+		return D.log("transactCallDirect", { txHash: e.hash }), D.log("done"), e;
 	}
-	return await _(E, L, z, R, B, void 0, void 0, f(T, E, k, A, O), V);
+	let W = await v(O, z, V, B, H, void 0, void 0, p(E, O, j, M, A), U);
+	return D.log("transactCallRelayer", { txHash: W }), D.log("done"), W;
 };
 //#endregion
-export { x as hinkalWithdraw };
+export { S as hinkalWithdraw };

package/common/src/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs

@@ -1 +1 @@
-const e=require(`../../constants/vite.constants.cjs`),t=require(`../crypto-keys/keys.cjs`),n=require(`../utxo/Utxo.cjs`),r=require(`../../webworker/worker.registry.cjs`),i=require(`../../webworker/performTaskWithWorker.cjs`),a=require(`../../webworker/utxoWorker/utxoWorker.types.cjs`);var o=16,s=class{NUM_WORKERS;NUM_WORKERS_BATCH_PROCESS;constructor(){e.isNode?(this.NUM_WORKERS=1,this.NUM_WORKERS_BATCH_PROCESS=1):(this.NUM_WORKERS=3,this.NUM_WORKERS_BATCH_PROCESS=Math.min(o,Math.ceil(navigator.deviceMemory??4)))}async createUtxoPromise(e){return await i.performTaskWithWorker({type:r.WorkerVariant.UTXO,payload:e})}async batchFilterUtxosWithNullifier(e,r){let i=this.sliceArrayIntoParts(e,this.NUM_WORKERS).map(e=>this.createUtxoPromise({type:a.UtxoWorkerActionType.BATCH_FILTER_UTXOS_WITH_NULLIFIER,data:{utxos:e.map(e=>e.getConstructableParams()),nullifiers:r}})),o=await Promise.all(i);return o.forEach(e=>{t.stealthPairCacheDevice.mergeWithSerialized(e.stealthPairCache),t.stealthAddressCacheDevice.mergeWithSerialized(e.stealthAddressCache)}),o.flatMap(e=>e.utxoConstructors).map(e=>new n.Utxo(e))}async buildBatchProcess(e,t,r){let i=this.sliceArrayIntoParts(e,this.NUM_WORKERS).map(e=>this.createUtxoPromise({type:a.UtxoWorkerActionType.BUILD_UTXOS,data:{signature:t.getSignature(),encryptedOutputs:e,chainId:r}}));return(await Promise.all(i)).flat().map(e=>new n.Utxo(e))}sliceArrayIntoParts(e,t){let n=Math.ceil(e.length/t);return Array.from({length:t},(t,r)=>e.slice(n*r,n*(r+1))).filter(e=>e.length>0)}findLastOutput(e,t){let n=t;return e.forEach(e=>{e!==t&&(n=e)}),n}async batchProcess(e,t,n,r){let i=this.sliceArrayIntoParts(e,this.NUM_WORKERS_BATCH_PROCESS),o=n.getSignature(),s=i.map(e=>{let n={type:a.UtxoWorkerActionType.DECIPHER_OUTPUTS,data:{encryptedOutputs:e,lastOutput:t,signature:o,chainId:r}};return this.createUtxoPromise(n)}),c=await Promise.all(s),l=c.map(({additionalEncryptedOutputs:e})=>e).flat(),u=new Set;return{additionalEncryptedOutputs:l.reduce((e,t)=>u.has(t.value)?e:(u.add(t.value),[...e,t]),[]),lastOutput:this.findLastOutput(c.map(e=>e.lastOutput),t)??t}}};exports.MultiThreadedUtxoUtils=s;
+const e=require(`../../constants/vite.constants.cjs`),t=require(`../crypto-keys/keys.cjs`),n=require(`../utxo/Utxo.cjs`),r=require(`../../functions/utils/hinkalTiming.utils.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/utxoWorker/utxoWorker.types.cjs`);var s=16,c=class{NUM_WORKERS;NUM_WORKERS_BATCH_PROCESS;constructor(){e.isNode?(this.NUM_WORKERS=1,this.NUM_WORKERS_BATCH_PROCESS=1):(this.NUM_WORKERS=3,this.NUM_WORKERS_BATCH_PROCESS=Math.min(s,Math.ceil(navigator.deviceMemory??4)))}async createUtxoPromise(e){return await a.performTaskWithWorker({type:i.WorkerVariant.UTXO,payload:e})}async batchFilterUtxosWithNullifier(e,i){let a=r.createHinkalTiming(`utxoUtils.batchFilter`),s=this.sliceArrayIntoParts(e,this.NUM_WORKERS);a.log(`start`,{utxoCount:e.length,workers:s.length});let c=s.map(e=>this.createUtxoPromise({type:o.UtxoWorkerActionType.BATCH_FILTER_UTXOS_WITH_NULLIFIER,data:{utxos:e.map(e=>e.getConstructableParams()),nullifiers:i}})),l=await Promise.all(c);return l.forEach(e=>{t.stealthPairCacheDevice.mergeWithSerialized(e.stealthPairCache),t.stealthAddressCacheDevice.mergeWithSerialized(e.stealthAddressCache)}),a.log(`done`),l.flatMap(e=>e.utxoConstructors).map(e=>new n.Utxo(e))}async buildBatchProcess(e,t,i){let a=r.createHinkalTiming(`utxoUtils.buildBatchProcess`),s=this.sliceArrayIntoParts(e,this.NUM_WORKERS);a.log(`start`,{encryptedOutputs:e.length,workers:s.length});let c=s.map(e=>this.createUtxoPromise({type:o.UtxoWorkerActionType.BUILD_UTXOS,data:{signature:t.getSignature(),encryptedOutputs:e,chainId:i}})),l=(await Promise.all(c)).flat().map(e=>new n.Utxo(e));return a.log(`done`,{utxoCount:l.length}),l}sliceArrayIntoParts(e,t){let n=Math.ceil(e.length/t);return Array.from({length:t},(t,r)=>e.slice(n*r,n*(r+1))).filter(e=>e.length>0)}findLastOutput(e,t){let n=t;return e.forEach(e=>{e!==t&&(n=e)}),n}async batchProcess(e,t,n,i){let a=r.createHinkalTiming(`utxoUtils.batchProcess`),s=this.sliceArrayIntoParts(e,this.NUM_WORKERS_BATCH_PROCESS);a.log(`start`,{encryptedOutputs:e.length,workers:s.length});let c=n.getSignature(),l=s.map(e=>{let n={type:o.UtxoWorkerActionType.DECIPHER_OUTPUTS,data:{encryptedOutputs:e,lastOutput:t,signature:c,chainId:i}};return this.createUtxoPromise(n)}),u=await Promise.all(l),d=u.map(({additionalEncryptedOutputs:e})=>e).flat(),f=new Set,p=d.reduce((e,t)=>f.has(t.value)?e:(f.add(t.value),[...e,t]),[]),m={additionalEncryptedOutputs:p,lastOutput:this.findLastOutput(u.map(e=>e.lastOutput),t)??t};return a.log(`done`,{additionalEncryptedOutputs:p.length}),m}};exports.MultiThreadedUtxoUtils=c;

package/common/src/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs

@@ -1,44 +1,55 @@
 import { isNode as e } from "../../constants/vite.constants.mjs";
 import { stealthAddressCacheDevice as t, stealthPairCacheDevice as n } from "../crypto-keys/keys.mjs";
 import { Utxo as r } from "../utxo/Utxo.mjs";
-import { WorkerVariant as i } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as a } from "../../webworker/performTaskWithWorker.mjs";
-import { UtxoWorkerActionType as o } from "../../webworker/utxoWorker/utxoWorker.types.mjs";
+import { createHinkalTiming as i } from "../../functions/utils/hinkalTiming.utils.mjs";
+import { WorkerVariant as a } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as o } from "../../webworker/performTaskWithWorker.mjs";
+import { UtxoWorkerActionType as s } from "../../webworker/utxoWorker/utxoWorker.types.mjs";
 //#region libs/shared/common/src/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.ts
-var s = 16, c = class {
+var c = 16, l = class {
 	NUM_WORKERS;
 	NUM_WORKERS_BATCH_PROCESS;
 	constructor() {
-		e ? (this.NUM_WORKERS = 1, this.NUM_WORKERS_BATCH_PROCESS = 1) : (this.NUM_WORKERS = 3, this.NUM_WORKERS_BATCH_PROCESS = Math.min(s, Math.ceil(navigator.deviceMemory ?? 4)));
+		e ? (this.NUM_WORKERS = 1, this.NUM_WORKERS_BATCH_PROCESS = 1) : (this.NUM_WORKERS = 3, this.NUM_WORKERS_BATCH_PROCESS = Math.min(c, Math.ceil(navigator.deviceMemory ?? 4)));
 	}
 	async createUtxoPromise(e) {
-		return await a({
-			type: i.UTXO,
+		return await o({
+			type: a.UTXO,
 			payload: e
 		});
 	}
-	async batchFilterUtxosWithNullifier(e, i) {
-		let a = this.sliceArrayIntoParts(e, this.NUM_WORKERS).map((e) => this.createUtxoPromise({
-			type: o.BATCH_FILTER_UTXOS_WITH_NULLIFIER,
+	async batchFilterUtxosWithNullifier(e, a) {
+		let o = i("utxoUtils.batchFilter"), c = this.sliceArrayIntoParts(e, this.NUM_WORKERS);
+		o.log("start", {
+			utxoCount: e.length,
+			workers: c.length
+		});
+		let l = c.map((e) => this.createUtxoPromise({
+			type: s.BATCH_FILTER_UTXOS_WITH_NULLIFIER,
 			data: {
 				utxos: e.map((e) => e.getConstructableParams()),
-				nullifiers: i
+				nullifiers: a
 			}
-		})), s = await Promise.all(a);
-		return s.forEach((e) => {
+		})), u = await Promise.all(l);
+		return u.forEach((e) => {
 			n.mergeWithSerialized(e.stealthPairCache), t.mergeWithSerialized(e.stealthAddressCache);
-		}), s.flatMap((e) => e.utxoConstructors).map((e) => new r(e));
+		}), o.log("done"), u.flatMap((e) => e.utxoConstructors).map((e) => new r(e));
 	}
 	async buildBatchProcess(e, t, n) {
-		let i = this.sliceArrayIntoParts(e, this.NUM_WORKERS).map((e) => this.createUtxoPromise({
-			type: o.BUILD_UTXOS,
+		let a = i("utxoUtils.buildBatchProcess"), o = this.sliceArrayIntoParts(e, this.NUM_WORKERS);
+		a.log("start", {
+			encryptedOutputs: e.length,
+			workers: o.length
+		});
+		let c = o.map((e) => this.createUtxoPromise({
+			type: s.BUILD_UTXOS,
 			data: {
 				signature: t.getSignature(),
 				encryptedOutputs: e,
 				chainId: n
 			}
-		}));
-		return (await Promise.all(i)).flat().map((e) => new r(e));
+		})), l = (await Promise.all(c)).flat().map((e) => new r(e));
+		return a.log("done", { utxoCount: l.length }), l;
 	}
 	sliceArrayIntoParts(e, t) {
 		let n = Math.ceil(e.length / t);
@@ -51,23 +62,28 @@ var s = 16, c = class {
 		}), n;
 	}
 	async batchProcess(e, t, n, r) {
-		let i = this.sliceArrayIntoParts(e, this.NUM_WORKERS_BATCH_PROCESS), a = n.getSignature(), s = i.map((e) => {
+		let a = i("utxoUtils.batchProcess"), o = this.sliceArrayIntoParts(e, this.NUM_WORKERS_BATCH_PROCESS);
+		a.log("start", {
+			encryptedOutputs: e.length,
+			workers: o.length
+		});
+		let c = n.getSignature(), l = o.map((e) => {
 			let n = {
-				type: o.DECIPHER_OUTPUTS,
+				type: s.DECIPHER_OUTPUTS,
 				data: {
 					encryptedOutputs: e,
 					lastOutput: t,
-					signature: a,
+					signature: c,
 					chainId: r
 				}
 			};
 			return this.createUtxoPromise(n);
-		}), c = await Promise.all(s), l = c.map(({ additionalEncryptedOutputs: e }) => e).flat(), u = /* @__PURE__ */ new Set();
-		return {
-			additionalEncryptedOutputs: l.reduce((e, t) => u.has(t.value) ? e : (u.add(t.value), [...e, t]), []),
-			lastOutput: this.findLastOutput(c.map((e) => e.lastOutput), t) ?? t
+		}), u = await Promise.all(l), d = u.map(({ additionalEncryptedOutputs: e }) => e).flat(), f = /* @__PURE__ */ new Set(), p = d.reduce((e, t) => f.has(t.value) ? e : (f.add(t.value), [...e, t]), []), m = {
+			additionalEncryptedOutputs: p,
+			lastOutput: this.findLastOutput(u.map((e) => e.lastOutput), t) ?? t
 		};
+		return a.log("done", { additionalEncryptedOutputs: p.length }), m;
 	}
 };
 //#endregion
-export { c as MultiThreadedUtxoUtils };
+export { l as MultiThreadedUtxoUtils };

package/common/src/functions/pre-transaction/buildCommitmentValidationData.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../utils/solanaMint.utils.cjs`),r=require(`../snarkjs/common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var s=async(s,c,l,u)=>{if(r.hasOnlyZeroAmounts(u))return;let d=e.isSolanaLike(s),f=u.map(e=>e.map(e=>e.amount.toString())),p=u.map(e=>e.map(e=>e.timeStamp)),m=u.map(e=>e.map(e=>r.getUtxoCircuitInRandomization(e))),h=u.map(e=>e.map(e=>e.getConstructableParams())),g=u.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString())),_=await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:h}}}),v=c.getShieldedPrivateKey(),y=c.getSpendingKeyPair().pubSpendingBJJPoint,b=d?l.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):l.map(e=>BigInt(e).toString());u.forEach((e,n)=>{e.forEach((e,r)=>{let i=e.getStealthAddress(),a=e.spendingPublicKey??y,o=e.isNewStyle&&e.H0?t.UserKeys.getStealthAddressNewStyle(e.H0,v,a):t.UserKeys.getStealthAddress(BigInt(e.randomization),v);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})});let x={nullifyingPrivateKey:v,spendingPublicKey:y,erc20TokenAddresses:b,inAmounts:f,inRandomizations:m,inH0Ax:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:u.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:p,inCommitments:g,inNullifiers:_};if(!(!l.length||!u[0]?.length))return{tokenAddresses:b,inAmounts:f,inTimeStamps:p,inRandomizations:m,inCommitments:g,inNullifiers:_,verifierName:`commitmentCalculator${l.length}x${u[0].length}`,commitmentInput:x}},c=(e,t)=>{if(!(!e||!t))return{tokenAddresses:e.tokenAddresses,inAmounts:e.inAmounts,inTimeStamps:e.inTimeStamps,inRandomizations:e.inRandomizations,inCommitments:e.inCommitments,inNullifiers:e.inNullifiers,proof:{a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2]}}};exports.buildCommitmentValidationData=s,exports.buildCommitmentValidationDataFromProof=c;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../utils/solanaMint.utils.cjs`),r=require(`../utils/hinkalTiming.utils.cjs`),i=require(`../snarkjs/common.snarkjs.cjs`),a=require(`../../webworker/worker.registry.cjs`),o=require(`../../webworker/performTaskWithWorker.cjs`),s=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var c=async(c,l,u,d)=>{let f=r.createHinkalTiming(`buildCommitmentValidationData`);if(i.hasOnlyZeroAmounts(d))return;let p=e.isSolanaLike(c),m=d.map(e=>e.map(e=>e.amount.toString())),h=d.map(e=>e.map(e=>e.timeStamp)),g=d.map(e=>e.map(e=>i.getUtxoCircuitInRandomization(e))),_=d.map(e=>e.map(e=>e.getConstructableParams())),v=d.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString())),y=await o.performTaskWithWorker({type:a.WorkerVariant.ZKProof,payload:{type:s.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:_}}});f.log(`buildInNullifiers`);let b=l.getShieldedPrivateKey(),x=l.getSpendingKeyPair().pubSpendingBJJPoint,S=p?u.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):u.map(e=>BigInt(e).toString());d.forEach((e,n)=>{e.forEach((e,r)=>{let i=e.getStealthAddress(),a=e.spendingPublicKey??x,o=e.isNewStyle&&e.H0?t.UserKeys.getStealthAddressNewStyle(e.H0,b,a):t.UserKeys.getStealthAddress(BigInt(e.randomization),b);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})}),f.log(`stealthValidation`);let C={nullifyingPrivateKey:b,spendingPublicKey:x,erc20TokenAddresses:S,inAmounts:m,inRandomizations:g,inH0Ax:d.map(e=>e.map(e=>i.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:d.map(e=>e.map(e=>i.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:d.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:h,inCommitments:v,inNullifiers:y};if(!(!u.length||!d[0]?.length))return{tokenAddresses:S,inAmounts:m,inTimeStamps:h,inRandomizations:g,inCommitments:v,inNullifiers:y,verifierName:`commitmentCalculator${u.length}x${d[0].length}`,commitmentInput:C}},l=(e,t)=>{if(!(!e||!t))return{tokenAddresses:e.tokenAddresses,inAmounts:e.inAmounts,inTimeStamps:e.inTimeStamps,inRandomizations:e.inRandomizations,inCommitments:e.inCommitments,inNullifiers:e.inNullifiers,proof:{a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2]}}};exports.buildCommitmentValidationData=c,exports.buildCommitmentValidationDataFromProof=l;

package/common/src/functions/pre-transaction/buildCommitmentValidationData.mjs

@@ -1,53 +1,57 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
 import { UserKeys as t } from "../../data-structures/crypto-keys/keys.mjs";
 import { formatMintAddress as n } from "../utils/solanaMint.utils.mjs";
-import { getUtxoCircuitH0Coords as r, getUtxoCircuitInRandomization as i, hasOnlyZeroAmounts as a } from "../snarkjs/common.snarkjs.mjs";
-import { WorkerVariant as o } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as s } from "../../webworker/performTaskWithWorker.mjs";
-import { ZKProofWorkerActionType as c } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { createHinkalTiming as r } from "../utils/hinkalTiming.utils.mjs";
+import { getUtxoCircuitH0Coords as i, getUtxoCircuitInRandomization as a, hasOnlyZeroAmounts as o } from "../snarkjs/common.snarkjs.mjs";
+import { WorkerVariant as s } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as c } from "../../webworker/performTaskWithWorker.mjs";
+import { ZKProofWorkerActionType as l } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/buildCommitmentValidationData.ts
-var l = async (l, u, d, f) => {
-	if (a(f)) return;
-	let p = e(l), m = f.map((e) => e.map((e) => e.amount.toString())), h = f.map((e) => e.map((e) => e.timeStamp)), g = f.map((e) => e.map((e) => i(e))), _ = f.map((e) => e.map((e) => e.getConstructableParams())), v = f.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), y = await s({
-		type: o.ZKProof,
+var u = async (u, d, f, p) => {
+	let m = r("buildCommitmentValidationData");
+	if (o(p)) return;
+	let h = e(u), g = p.map((e) => e.map((e) => e.amount.toString())), _ = p.map((e) => e.map((e) => e.timeStamp)), v = p.map((e) => e.map((e) => a(e))), y = p.map((e) => e.map((e) => e.getConstructableParams())), b = p.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), x = await c({
+		type: s.ZKProof,
 		payload: {
-			type: c.BUILD_IN_NULLIFIERS,
-			data: { inputUtxosSerialized: _ }
+			type: l.BUILD_IN_NULLIFIERS,
+			data: { inputUtxosSerialized: y }
 		}
-	}), b = u.getShieldedPrivateKey(), x = u.getSpendingKeyPair().pubSpendingBJJPoint, S = p ? d.map((e) => {
+	});
+	m.log("buildInNullifiers");
+	let S = d.getShieldedPrivateKey(), C = d.getSpendingKeyPair().pubSpendingBJJPoint, w = h ? f.map((e) => {
 		let { compressedAddress: t } = n(e);
 		return BigInt(t).toString();
-	}) : d.map((e) => BigInt(e).toString());
-	f.forEach((e, n) => {
+	}) : f.map((e) => BigInt(e).toString());
+	p.forEach((e, n) => {
 		e.forEach((e, r) => {
-			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? x, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, b, a) : t.getStealthAddress(BigInt(e.randomization), b);
+			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? C, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, S, a) : t.getStealthAddress(BigInt(e.randomization), S);
 			if (BigInt(i).toString() !== BigInt(o).toString()) throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`);
 		});
-	});
-	let C = {
-		nullifyingPrivateKey: b,
-		spendingPublicKey: x,
-		erc20TokenAddresses: S,
-		inAmounts: m,
-		inRandomizations: g,
-		inH0Ax: f.map((e) => e.map((e) => r(e)[0].toString())),
-		inH0Ay: f.map((e) => e.map((e) => r(e)[1].toString())),
-		isNewStyle: f.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: h,
-		inCommitments: v,
-		inNullifiers: y
+	}), m.log("stealthValidation");
+	let T = {
+		nullifyingPrivateKey: S,
+		spendingPublicKey: C,
+		erc20TokenAddresses: w,
+		inAmounts: g,
+		inRandomizations: v,
+		inH0Ax: p.map((e) => e.map((e) => i(e)[0].toString())),
+		inH0Ay: p.map((e) => e.map((e) => i(e)[1].toString())),
+		isNewStyle: p.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: _,
+		inCommitments: b,
+		inNullifiers: x
 	};
-	if (!(!d.length || !f[0]?.length)) return {
-		tokenAddresses: S,
-		inAmounts: m,
-		inTimeStamps: h,
-		inRandomizations: g,
-		inCommitments: v,
-		inNullifiers: y,
-		verifierName: `commitmentCalculator${d.length}x${f[0].length}`,
-		commitmentInput: C
+	if (!(!f.length || !p[0]?.length)) return {
+		tokenAddresses: w,
+		inAmounts: g,
+		inTimeStamps: _,
+		inRandomizations: v,
+		inCommitments: b,
+		inNullifiers: x,
+		verifierName: `commitmentCalculator${f.length}x${p[0].length}`,
+		commitmentInput: T
 	};
-}, u = (e, t) => {
+}, d = (e, t) => {
 	if (!(!e || !t)) return {
 		tokenAddresses: e.tokenAddresses,
 		inAmounts: e.inAmounts,
@@ -63,4 +67,4 @@ var l = async (l, u, d, f) => {
 	};
 };
 //#endregion
-export { l as buildCommitmentValidationData, u as buildCommitmentValidationDataFromProof };
+export { u as buildCommitmentValidationData, d as buildCommitmentValidationDataFromProof };

package/common/src/functions/snarkjs/constructGeneralZkProof.cjs

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

package/common/src/functions/snarkjs/constructGeneralZkProof.mjs

@@ -3,80 +3,91 @@ import { defaultSignatureData as ee, zeroAddress as n } from "../../constants/pr
 import { poseidonFunction as te } from "../../crypto/poseidon.mjs";
 import { randomBigInt as r } from "../web3/etherFunctions.mjs";
 import { UserKeys as i } from "../../data-structures/crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as a } from "../utils/time.utils.mjs";
-import { ExternalActionId as o } from "../../types/external-action.types.mjs";
-import { Logger as s } from "../../error-handling/logger.mjs";
-import { takeOffHighestBit as ne } from "../utils/bit.operations.mjs";
-import { buildOutCommitments as re, calcAmountChanges as c, calcEncryptedOutputs as ie, calcPublicSignalCount as ae, calcStealthAddressStructure as oe, createCallDataHash as se, getSlippageValues as ce, getUtxoCircuitH0Coords as l, getUtxoCircuitInRandomization as le, getZkProofVerifierName as ue } from "./common.snarkjs.mjs";
+import { getCurrentTimeInSeconds as ne } from "../utils/time.utils.mjs";
+import { ExternalActionId as re } from "../../types/external-action.types.mjs";
+import { createHinkalTiming as ie } from "../utils/hinkalTiming.utils.mjs";
+import { Logger as ae } from "../../error-handling/logger.mjs";
+import { takeOffHighestBit as oe } from "../utils/bit.operations.mjs";
+import { buildOutCommitments as se, calcAmountChanges as a, calcEncryptedOutputs as o, calcPublicSignalCount as s, calcStealthAddressStructure as c, createCallDataHash as l, getSlippageValues as ce, getUtxoCircuitH0Coords as u, getUtxoCircuitInRandomization as le, getZkProofVerifierName as ue } from "./common.snarkjs.mjs";
 import { computeSignedMessageHashEvm as de } from "./signedMessageHash.mjs";
 import { generateCircomData as fe } from "./generateCircomData.mjs";
-import { AccountActions as u } from "../../data-structures/AccountActions/AccountActions.mjs";
-import { generateMainAndCommitmentZkProof as d } from "./generateMainAndCommitmentZkProof.mjs";
-import { getDataFromWorkers as f } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-import { encodeEmporiumMetadata as p } from "../private-wallet/emporium.helpers.mjs";
+import { AccountActions as pe } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { generateMainAndCommitmentZkProof as me } from "./generateMainAndCommitmentZkProof.mjs";
+import { getDataFromWorkers as d } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { encodeEmporiumMetadata as f } from "../private-wallet/emporium.helpers.mjs";
 //#region libs/shared/common/src/functions/snarkjs/constructGeneralZkProof.ts
-var m = async (m, h, g, _, v, y, b, pe, x, S = n, C = e.localhost, w = h.map(() => !1), T = void 0, E, D) => {
-	let O = ue(h, g), k = c(h, g), A = h.map((e) => e[0].erc20TokenAddress), j = ie(g), M = ee, N = _.getShieldedPrivateKey(), { pubSpendingBJJPoint: P } = _.getSpendingKeyPair(), F = oe(i.findCorrectRandomization(r(31), N), N, _.getSpendingKeyPair().pubSpendingBJJPoint), { inCommitmentSiblings: I, inCommitmentSiblingSides: L, rootHashHinkal: R, inNullifiers: z } = await f(C, m, h.map((e) => e.map((e) => e.getConstructableParams()))), B = re(g), V = r(31), H = te(V), U = BigInt(g.length > 0 ? g[0][0].timeStamp : a()), W = {
-		rootHashHinkal: R,
-		spendingPublicKey: P,
-		nullifyingPrivateKey: N,
-		erc20TokenAddresses: A,
-		amountChanges: k,
-		inAmounts: h.map((e) => e.map((e) => e.amount.toString())),
-		inRandomizations: h.map((e) => e.map((e) => le(e))),
-		inH0Ax: h.map((e) => e.map((e) => l(e)[0].toString())),
-		inH0Ay: h.map((e) => e.map((e) => l(e)[1].toString())),
-		isNewStyle: h.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: h.map((e) => e.map((e) => e.timeStamp)),
-		inNullifiers: z,
-		inCommitmentSiblings: I,
-		inCommitmentSiblingSides: L,
-		outAmounts: g.map((e) => e.map((e) => e.amount.toString())),
-		outTimeStamp: U,
-		outPublicKeys: g.map((e) => e.map((e) => e.getStealthAddress())),
-		outCommitments: B,
+var p = async (p, m, h, g, _, v, y, b, x, S = n, C = e.localhost, w = m.map(() => !1), T = void 0, E, D) => {
+	let O = ie("constructZkProof"), k = ue(m, h), A = a(m, h), j = m.map((e) => e[0].erc20TokenAddress), M = o(h), N = ee, P = g.getShieldedPrivateKey(), { pubSpendingBJJPoint: F } = g.getSpendingKeyPair(), I = c(i.findCorrectRandomization(r(31), P), P, g.getSpendingKeyPair().pubSpendingBJJPoint), { inCommitmentSiblings: L, inCommitmentSiblingSides: R, rootHashHinkal: z, inNullifiers: B } = await d(C, p, m.map((e) => e.map((e) => e.getConstructableParams())));
+	O.log("getDataFromWorkers", {
+		verifierName: k,
+		chainId: C
+	});
+	let V = se(h), H = r(31), U = te(H), W = BigInt(h.length > 0 ? h[0][0].timeStamp : ne()), G = {
+		rootHashHinkal: z,
+		spendingPublicKey: F,
+		nullifyingPrivateKey: P,
+		erc20TokenAddresses: j,
+		amountChanges: A,
+		inAmounts: m.map((e) => e.map((e) => e.amount.toString())),
+		inRandomizations: m.map((e) => e.map((e) => le(e))),
+		inH0Ax: m.map((e) => e.map((e) => u(e)[0].toString())),
+		inH0Ay: m.map((e) => e.map((e) => u(e)[1].toString())),
+		isNewStyle: m.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: m.map((e) => e.map((e) => e.timeStamp)),
+		inNullifiers: B,
+		inCommitmentSiblings: L,
+		inCommitmentSiblingSides: R,
+		outAmounts: h.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: W,
+		outPublicKeys: h.map((e) => e.map((e) => e.getStealthAddress())),
+		outCommitments: V,
 		calldataHash: 0n,
-		messageSeed: V,
-		H0Ax: ne(F.extraRandomization),
-		H0Ay: F.H0
-	}, G = ae(O, W.erc20TokenAddresses, W.amountChanges, W.inNullifiers, W.outCommitments), K = c(h, g, !0), q = ce(K);
-	s.log({ publicSignalCount: G });
-	let J = Array.isArray(b) ? b : [b], me = t(C), he = D ? u.getSignerAddressFromPrivateKey(me, D) : void 0, Y = v === o.Emporium ? await p(C, y ?? n, D, J, H, he) : await p(C, n, void 0, v === 0n ? [] : J, H, n);
-	W.calldataHash = se(G, S, y, v, Y, j, T, q, w, x, M, E);
-	let X = de({
-		rootHashHinkal: R,
-		erc20TokenAddresses: A,
-		amountChanges: k,
-		outTimeStamp: U,
-		inNullifiers: z,
-		outCommitments: B,
-		calldataHash: W.calldataHash,
-		message: H,
-		outH1Ay: F.H1,
-		H0Ax: W.H0Ax,
-		H0Ay: F.H0
-	}), { R8: Z, S: ge } = _.signEddsa(X);
-	W.eddsaSignature = [
-		Z[0],
-		Z[1],
-		ge
-	], W.signedMessageHash = X;
-	let Q = O.startsWith("mainEVMCircuitMin0"), $ = {
-		outTimeStamp: U,
-		calldataHash: W.calldataHash,
-		messageSeed: V
-	}, { zkCallData: _e, commitmentValidationData: ve } = await d(C, _, A, h, O, Q ? $ : W, pe);
-	return {
-		zkCallData: _e,
-		circomData: fe(B, z, R, K, A, g, j, G, v, y, Y, S, W.calldataHash, F, w, T, Q ? Number(U) : void 0, q, x, M, E),
-		dimData: {
-			tokenNumber: h.length,
-			nullifierAmount: h.length > 0 ? h[0].length : 0,
-			outputAmount: g.length > 0 ? g[0].length : 0
-		},
-		encryptedOutputs: j,
-		commitmentValidationData: ve
+		messageSeed: H,
+		H0Ax: oe(I.extraRandomization),
+		H0Ay: I.H0
+	}, K = s(k, G.erc20TokenAddresses, G.amountChanges, G.inNullifiers, G.outCommitments), q = a(m, h, !0), J = ce(q);
+	ae.log({ publicSignalCount: K });
+	let Y = Array.isArray(y) ? y : [y], he = t(C), ge = D ? pe.getSignerAddressFromPrivateKey(he, D) : void 0, X = _ === re.Emporium ? await f(C, v ?? n, D, Y, U, ge) : await f(C, n, void 0, _ === 0n ? [] : Y, U, n);
+	O.log("encodeEmporiumMetadata", { externalActionId: _.toString() }), G.calldataHash = l(K, S, v, _, X, M, T, J, w, x, N, E);
+	let Z = de({
+		rootHashHinkal: z,
+		erc20TokenAddresses: j,
+		amountChanges: A,
+		outTimeStamp: W,
+		inNullifiers: B,
+		outCommitments: V,
+		calldataHash: G.calldataHash,
+		message: U,
+		outH1Ay: I.H1,
+		H0Ax: G.H0Ax,
+		H0Ay: I.H0
+	}), { R8: Q, S: _e } = g.signEddsa(Z);
+	G.eddsaSignature = [
+		Q[0],
+		Q[1],
+		_e
+	], G.signedMessageHash = Z;
+	let $ = k.startsWith("mainEVMCircuitMin0"), ve = {
+		outTimeStamp: W,
+		calldataHash: G.calldataHash,
+		messageSeed: H
+	}, { zkCallData: ye, commitmentValidationData: be } = await me(C, g, j, m, k, $ ? ve : G, b);
+	O.log("generateMainAndCommitmentZkProof", {
+		verifierName: k,
+		generateProofRemotely: b
+	});
+	let xe = fe(V, B, z, q, j, h, M, K, _, v, X, S, G.calldataHash, I, w, T, $ ? Number(W) : void 0, J, x, N, E), Se = {
+		tokenNumber: m.length,
+		nullifierAmount: m.length > 0 ? m[0].length : 0,
+		outputAmount: h.length > 0 ? h[0].length : 0
+	};
+	return O.log("done"), {
+		zkCallData: ye,
+		circomData: xe,
+		dimData: Se,
+		encryptedOutputs: M,
+		commitmentValidationData: be
 	};
 };
 //#endregion
-export { m as constructZkProof };
+export { p as constructZkProof };

package/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.cjs

@@ -1 +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;
+const e=require(`../utils/hinkalTiming.utils.cjs`),t=require(`../pre-transaction/buildCommitmentValidationData.cjs`);require(`../pre-transaction/index.cjs`);const n=require(`./generateZkProof.cjs`);var r=async(r,i,a,o,s,c,l)=>{let u=e.createHinkalTiming(`generateMainAndCommitmentZkProof`),d=await t.buildCommitmentValidationData(r,i,a,o);u.log(`buildCommitmentValidationData`,{mainVerifierName:s,hasCommitmentProof:!!d});let f=[s],p=[c];d&&(f.push(d.verifierName),p.push(d.commitmentInput));let m=await n.generateZkProof(r,f,p,l);u.log(`generateZkProof`,{verifierNames:f,generateProofRemotely:l});let{zkCallData:h,publicSignals:g}=m[0];return{zkCallData:h,publicSignals:g,commitmentValidationData:t.buildCommitmentValidationDataFromProof(d,m[1])}};exports.generateMainAndCommitmentZkProof=r;