@gurge/sdk 0.3.24 → 0.3.25

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/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;
+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/hinkalTiming.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=[...await l.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},x=async(i,l,u,x,S,C,w,T)=>{let E=s.createRnDeltaTiming(`withdraw`),D=c.validateAndGetChainId(l),O=e.isTronLike(D),k=o.addressToHexFormat(await i.getEthereumAddressByChain(D));E.log(`wallet.getEthereumAddressByChain`);let A=l.map(e=>e.erc20TokenAddress),j=await d.modifyVolatileTokenAmountChanges(D,l,u),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)}let P={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`},[F,{inputUtxosArray:I,outputUtxosArray:L}]=await Promise.all([i.getRandomRelay(D,!0),b(i,D,A,j)]);if(E.log(`utxoPrep+relay`,{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`);let H=O&&S?void 0:await o.reorderZkCallData(O,R,B,z);if(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(`done`,{txid:e}),e}let e=await g.transactCallDirect(i,D,j[0],M,R,z,B);return E.log(`done`,{txHash:e.hash}),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(`done`,{txHash:U}),U};exports.hinkalWithdraw=x;

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

@@ -2,6 +2,4 @@ import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
 import { AdminTransactionType, ERC20Token } from '../../types';
 import { ethers } from 'ethers';
-export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], // should differentiate now: amountChanges is about off-chain utxos
-recipientAddress: string, // for Tron this address may be passed as base58
-isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;
+export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientAddress: string, isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;

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

@@ -4,8 +4,8 @@ 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 { createHinkalTiming as o } from "../../functions/utils/hinkalTiming.utils.mjs";
-import { addressToHexFormat as s, reorderZkCallData as c } from "../../functions/utils/tron.utils.mjs";
+import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
+import { createRnDeltaTiming as c } from "../../functions/utils/hinkalTiming.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";
@@ -21,58 +21,45 @@ import { transactCallDirectTron as y } from "../../functions/web3/functionCalls/
 import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
 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();
+	let a = [...await u(e, t, n, r)], o = [], s = i().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = d(e.userKeys, s[t], r[t], l);
-		c.push(n);
+		let { outputUtxos: n } = d(e.userKeys, a[t], r[t], s);
+		o.push(n);
 	}
-	return a.log("outputUtxoProcessing"), {
-		inputUtxosArray: s,
-		outputUtxosArray: c
+	return {
+		inputUtxosArray: a,
+		outputUtxosArray: o
 	};
 }, 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];
+	let D = c("withdraw"), O = l(u), k = e(O), A = o(await i.getEthereumAddressByChain(O));
+	D.log("wallet.getEthereumAddressByChain");
+	let j = u.map((e) => e.erc20TokenAddress), M = await f(O, u, d), 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 });
+		P = await h(O, N, -M[0], e), await b(O, j, M, P);
 	}
 	let F = {
 		externalActionId: 0n,
-		externalAddress: s(S),
+		externalAddress: o(S),
 		externalActionMetadata: "0x00"
-	}, [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);
+	}, [I, { inputUtxosArray: L, outputUtxosArray: R }] = await Promise.all([i.getRandomRelay(O, !0), x(i, O, j, M)]);
+	if (D.log("utxoPrep+relay", { 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) {
+	D.log("constructZkProof");
+	let U = k && C ? void 0 : await s(k, z, V, B);
+	if (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;
+			return D.log("done", { txid: e }), e;
 		}
 		let e = await _(i, O, M[0], N, z, B, V);
-		return D.log("transactCallDirect", { txHash: e.hash }), D.log("done"), e;
+		return D.log("done", { txHash: e.hash }), e;
 	}
 	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;
+	return D.log("done", { txHash: W }), W;
 };
 //#endregion
 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(`../../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;
+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.createRnDeltaTiming(`webView.utxoBatchFilter`),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.createRnDeltaTiming(`webView.utxoBuildBatch`),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.createRnDeltaTiming(`webView.utxoBatchProcess`),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,7 +1,7 @@
 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 { createHinkalTiming as i } from "../../functions/utils/hinkalTiming.utils.mjs";
+import { createRnDeltaTiming 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";
@@ -19,7 +19,7 @@ var c = 16, l = class {
 		});
 	}
 	async batchFilterUtxosWithNullifier(e, a) {
-		let o = i("utxoUtils.batchFilter"), c = this.sliceArrayIntoParts(e, this.NUM_WORKERS);
+		let o = i("webView.utxoBatchFilter"), c = this.sliceArrayIntoParts(e, this.NUM_WORKERS);
 		o.log("start", {
 			utxoCount: e.length,
 			workers: c.length
@@ -36,7 +36,7 @@ var c = 16, l = class {
 		}), o.log("done"), u.flatMap((e) => e.utxoConstructors).map((e) => new r(e));
 	}
 	async buildBatchProcess(e, t, n) {
-		let a = i("utxoUtils.buildBatchProcess"), o = this.sliceArrayIntoParts(e, this.NUM_WORKERS);
+		let a = i("webView.utxoBuildBatch"), o = this.sliceArrayIntoParts(e, this.NUM_WORKERS);
 		a.log("start", {
 			encryptedOutputs: e.length,
 			workers: o.length
@@ -62,7 +62,7 @@ var c = 16, l = class {
 		}), n;
 	}
 	async batchProcess(e, t, n, r) {
-		let a = i("utxoUtils.batchProcess"), o = this.sliceArrayIntoParts(e, this.NUM_WORKERS_BATCH_PROCESS);
+		let a = i("webView.utxoBatchProcess"), o = this.sliceArrayIntoParts(e, this.NUM_WORKERS_BATCH_PROCESS);
 		a.log("start", {
 			encryptedOutputs: e.length,
 			workers: o.length

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(`../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;
+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.createRnDeltaTiming(`mainThread.commitmentValidation`);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()));f.log(`serializeInputs`);let v=r.createRnDeltaTiming(`mainThread.getCommitment`),y=d.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString()));v.log(`all-utxos`,{count:d.reduce((e,t)=>e+t.length,0)});let b=await o.performTaskWithWorker({type:a.WorkerVariant.ZKProof,payload:{type:s.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:_}}});f.log(`buildInNullifiers-worker-done`);let x=l.getShieldedPrivateKey(),S=l.getSpendingKeyPair().pubSpendingBJJPoint,C=p?u.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):u.map(e=>BigInt(e).toString()),w=r.createRnDeltaTiming(`mainThread.stealthValidation`),T=0;d.forEach((e,n)=>{e.forEach((e,r)=>{T+=1;let i=e.getStealthAddress(),a=e.spendingPublicKey??S,o=e.isNewStyle&&e.H0?t.UserKeys.getStealthAddressNewStyle(e.H0,x,a):t.UserKeys.getStealthAddress(BigInt(e.randomization),x);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})}),w.log(`all-utxos`,{stealthChecks:T});let E={nullifyingPrivateKey:x,spendingPublicKey:S,erc20TokenAddresses:C,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:y,inNullifiers:b};if(!u.length||!d[0]?.length)return;let D=`commitmentCalculator${u.length}x${d[0].length}`;return f.log(`done`,{verifierName:D}),{tokenAddresses:C,inAmounts:m,inTimeStamps:h,inRandomizations:g,inCommitments:y,inNullifiers:b,verifierName:D,commitmentInput:E}},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,55 +1,62 @@
 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 { createHinkalTiming as r } from "../utils/hinkalTiming.utils.mjs";
+import { createRnDeltaTiming 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 u = async (u, d, f, p) => {
-	let m = r("buildCommitmentValidationData");
+	let m = r("mainThread.commitmentValidation");
 	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({
+	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()));
+	m.log("serializeInputs");
+	let b = r("mainThread.getCommitment"), x = p.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString()));
+	b.log("all-utxos", { count: p.reduce((e, t) => e + t.length, 0) });
+	let S = await c({
 		type: s.ZKProof,
 		payload: {
 			type: l.BUILD_IN_NULLIFIERS,
 			data: { inputUtxosSerialized: y }
 		}
 	});
-	m.log("buildInNullifiers");
-	let S = d.getShieldedPrivateKey(), C = d.getSpendingKeyPair().pubSpendingBJJPoint, w = h ? f.map((e) => {
+	m.log("buildInNullifiers-worker-done");
+	let C = d.getShieldedPrivateKey(), w = d.getSpendingKeyPair().pubSpendingBJJPoint, T = h ? f.map((e) => {
 		let { compressedAddress: t } = n(e);
 		return BigInt(t).toString();
-	}) : f.map((e) => BigInt(e).toString());
+	}) : f.map((e) => BigInt(e).toString()), E = r("mainThread.stealthValidation"), D = 0;
 	p.forEach((e, n) => {
 		e.forEach((e, r) => {
-			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);
+			D += 1;
+			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? w, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, C, a) : t.getStealthAddress(BigInt(e.randomization), C);
 			if (BigInt(i).toString() !== BigInt(o).toString()) throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`);
 		});
-	}), m.log("stealthValidation");
-	let T = {
-		nullifyingPrivateKey: S,
-		spendingPublicKey: C,
-		erc20TokenAddresses: w,
+	}), E.log("all-utxos", { stealthChecks: D });
+	let O = {
+		nullifyingPrivateKey: C,
+		spendingPublicKey: w,
+		erc20TokenAddresses: T,
 		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
+		inCommitments: x,
+		inNullifiers: S
 	};
-	if (!(!f.length || !p[0]?.length)) return {
-		tokenAddresses: w,
+	if (!f.length || !p[0]?.length) return;
+	let k = `commitmentCalculator${f.length}x${p[0].length}`;
+	return m.log("done", { verifierName: k }), {
+		tokenAddresses: T,
 		inAmounts: g,
 		inTimeStamps: _,
 		inRandomizations: v,
-		inCommitments: b,
-		inNullifiers: x,
-		verifierName: `commitmentCalculator${f.length}x${p[0].length}`,
-		commitmentInput: T
+		inCommitments: x,
+		inNullifiers: S,
+		verifierName: k,
+		commitmentInput: O
 	};
 }, d = (e, t) => {
 	if (!(!e || !t)) return {

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

@@ -1 +1 @@
-const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);var r=(r,i,a,o,s=!0,c,l)=>{let u=e.countTotalAmountInUtxos(i),{erc20TokenAddress:d,mintAddress:f}=i[0];if(s&&a<0n&&u+a<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let p=[new n.Utxo({amount:e.bigintMax(u+a,0n),erc20TokenAddress:d,mintAddress:f,nullifyingKey:r.getShieldedPrivateKey(),timeStamp:o,spendingPublicKey:r.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0})];if(c!==void 0&&l!==void 0){let[e,t,r,,i]=c.split(`,`);p.push(new n.Utxo({amount:l,erc20TokenAddress:d,mintAddress:f,H0:[BigInt(t),BigInt(r)],stealthAddress:e,encryptionKey:i,timeStamp:o,isNewStyle:!0}))}return{outputUtxos:p}};exports.outputUtxoProcessing=r;
+const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`),r=require(`../utils/hinkalTiming.utils.cjs`);var i=(i,a,o,s,c=!0,l,u)=>{let d=r.createRnDeltaTiming(`mainThread.outputUtxo`),f=e.countTotalAmountInUtxos(a),{erc20TokenAddress:p,mintAddress:m}=a[0];if(c&&o<0n&&f+o<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);d.log(`sumInputs`);let h=[new n.Utxo({amount:e.bigintMax(f+o,0n),erc20TokenAddress:p,mintAddress:m,nullifyingKey:i.getShieldedPrivateKey(),timeStamp:s,spendingPublicKey:i.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0})];if(d.log(`newUtxo-change`,{randomization:!!h[0].randomization,h0:!!h[0].H0}),l!==void 0&&u!==void 0){let[e,t,r,,i]=l.split(`,`);h.push(new n.Utxo({amount:u,erc20TokenAddress:p,mintAddress:m,H0:[BigInt(t),BigInt(r)],stealthAddress:e,encryptionKey:i,timeStamp:s,isNewStyle:!0})),d.log(`newUtxo-recipient`)}return d.log(`done`,{outputCount:h.length}),{outputUtxos:h}};exports.outputUtxoProcessing=i;

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

@@ -1,33 +1,38 @@
 import { bigintMax as e, countTotalAmountInUtxos as t } from "../utils/amounts.utils.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { Utxo as r } from "../../data-structures/utxo/Utxo.mjs";
+import { createRnDeltaTiming as i } from "../utils/hinkalTiming.utils.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/outputUtxoProcessing.ts
-var i = (i, a, o, s, c = !0, l, u) => {
-	let d = t(a), { erc20TokenAddress: f, mintAddress: p } = a[0];
-	if (c && o < 0n && d + o < 0n) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let m = [new r({
-		amount: e(d + o, 0n),
-		erc20TokenAddress: f,
-		mintAddress: p,
-		nullifyingKey: i.getShieldedPrivateKey(),
-		timeStamp: s,
-		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint,
+var a = (a, o, s, c, l = !0, u, d) => {
+	let f = i("mainThread.outputUtxo"), p = t(o), { erc20TokenAddress: m, mintAddress: h } = o[0];
+	if (l && s < 0n && p + s < 0n) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	f.log("sumInputs");
+	let g = [new r({
+		amount: e(p + s, 0n),
+		erc20TokenAddress: m,
+		mintAddress: h,
+		nullifyingKey: a.getShieldedPrivateKey(),
+		timeStamp: c,
+		spendingPublicKey: a.getSpendingKeyPair().pubSpendingBJJPoint,
 		isNewStyle: !0
 	})];
-	if (l !== void 0 && u !== void 0) {
-		let [e, t, n, , i] = l.split(",");
-		m.push(new r({
-			amount: u,
-			erc20TokenAddress: f,
-			mintAddress: p,
+	if (f.log("newUtxo-change", {
+		randomization: !!g[0].randomization,
+		h0: !!g[0].H0
+	}), u !== void 0 && d !== void 0) {
+		let [e, t, n, , i] = u.split(",");
+		g.push(new r({
+			amount: d,
+			erc20TokenAddress: m,
+			mintAddress: h,
 			H0: [BigInt(t), BigInt(n)],
 			stealthAddress: e,
 			encryptionKey: i,
-			timeStamp: s,
+			timeStamp: c,
 			isNewStyle: !0
-		}));
+		})), f.log("newUtxo-recipient");
 	}
-	return { outputUtxos: m };
+	return f.log("done", { outputCount: g.length }), { outputUtxos: g };
 };
 //#endregion
-export { i as outputUtxoProcessing };
+export { a as outputUtxoProcessing };

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

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

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

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

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

@@ -1 +1 @@
-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;
+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/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.mjs

@@ -1,27 +1,16 @@
-import { createHinkalTiming as e } from "../utils/hinkalTiming.utils.mjs";
-import { buildCommitmentValidationData as t, buildCommitmentValidationDataFromProof as n } from "../pre-transaction/buildCommitmentValidationData.mjs";
+import { buildCommitmentValidationData as e, buildCommitmentValidationDataFromProof as t } from "../pre-transaction/buildCommitmentValidationData.mjs";
 import "../pre-transaction/index.mjs";
-import { generateZkProof as r } from "./generateZkProof.mjs";
+import { generateZkProof as n } from "./generateZkProof.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.ts
-var i = async (i, a, o, s, c, l, u) => {
-	let d = e("generateMainAndCommitmentZkProof"), f = await t(i, a, o, s);
-	d.log("buildCommitmentValidationData", {
-		mainVerifierName: c,
-		hasCommitmentProof: !!f
-	});
-	let p = [c], m = [l];
-	f && (p.push(f.verifierName), m.push(f.commitmentInput));
-	let h = await r(i, p, m, u);
-	d.log("generateZkProof", {
-		verifierNames: p,
-		generateProofRemotely: u
-	});
-	let { zkCallData: g, publicSignals: _ } = h[0];
+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: g,
-		publicSignals: _,
-		commitmentValidationData: n(f, h[1])
+		zkCallData: m,
+		publicSignals: h,
+		commitmentValidationData: t(u, p[1])
 	};
 };
 //#endregion
-export { i as generateMainAndCommitmentZkProof };
+export { r as generateMainAndCommitmentZkProof };

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

@@ -1 +1 @@
-const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../utils/hinkalTiming.utils.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`./getZKFiles.cjs`),i=require(`./generateZkProofEnclave.cjs`),a=require(`./generateZkProofSelf.cjs`);var o=async(o,s,c,l)=>{let u=t.createHinkalTiming(`generateZkProof`);if(u.log(`start`,{remotely:!!l,verifierNames:s}),l)try{let t=e.getCustomProofGenerator();if(t){let e=await t(c,s.map(e=>r.getWASMFile(e,o)),s.map(e=>r.getZKeyFile(e,o)));return u.log(`customProofGenerator`,{verifierNames:s}),e.map(({zkCallData:e,publicSignals:t})=>({zkCallData:e,publicSignals:t}))}let n=await i.generateZkProofEnclave(o,s,c);return u.log(`enclave`,{verifierNames:s}),n}catch(e){n.Logger.error(`enclave proof error`,e),u.log(`enclave-failed-fallback-self`)}let d=await Promise.all(s.map((e,t)=>a.generateZkProofSelf(o,e,c[t])));return u.log(`self`,{verifierNames:s}),d};exports.generateZkProof=o;
+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;