@gurge/sdk 0.3.22 → 0.3.23

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/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`),p=require(`../../functions/utils/hinkalTiming.utils.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 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}},x=async(i,c,l,x,S,C,w,T)=>{let E=p.createHinkalTiming(`withdraw`),D=s.validateAndGetChainId(c),O=e.isTronLike(D);E.log(`start`,{chainId:D,isRelayerOff:S,tokenCount:c.length});let k=o.addressToHexFormat(await i.getEthereumAddressByChain(D));E.log(`getEthereumAddress`);let A=c.map(e=>e.erc20TokenAddress),j=await u.modifyVolatileTokenAmountChanges(D,c,l);E.log(`modifyVolatileTokenAmountChanges`);let M=c[0];if(!M)throw Error(`Deposit Action: No Token Found`);let N;if(!S){let e=w??await f.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: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(`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 o.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,d.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

@@ -11,15 +11,16 @@ import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outpu
 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 m } from "../../functions/utils/hinkalTiming.utils.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) => {
+var x = async (e, t, n, r) => {
 	let a = [...await l(e, t, n, r)], o = [], s = i().toString();
 	for (let t = 0; t < n.length; t += 1) {
 		let { outputUtxos: n } = u(e.userKeys, a[t], r[t], s);
@@ -29,26 +30,44 @@ var b = async (e, t, n, r) => {
 		inputUtxosArray: a,
 		outputUtxosArray: o
 	};
-}, 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, l, u, S, C, w, T, E) => {
+	let D = m("withdraw"), O = c(l), k = e(O);
+	D.log("start", {
+		chainId: O,
+		isRelayerOff: C,
+		tokenCount: l.length
+	});
+	let A = o(await i.getEthereumAddressByChain(O));
+	D.log("getEthereumAddress");
+	let j = l.map((e) => e.erc20TokenAddress), M = await d(O, l, u);
+	D.log("modifyVolatileTokenAmountChanges");
+	let N = l[0];
+	if (!N) throw Error("Deposit Action: No Token Found");
+	let P;
+	if (!C) {
+		let e = T ?? await p(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: o(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([i.getRandomRelay(O, !0), 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 s(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, f(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/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`),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`),ne=require(`../utils/hinkalTiming.utils.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=ne.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(i.UserKeys.findCorrectRandomization(r.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=r.randomBigInt(31),H=n.poseidonFunction(V),U=BigInt(g.length>0?g[0][0].timeStamp:a.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?te.AccountActions.getSignerAddressFromPrivateKey(ae,O):void 0,Y=v===o.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=ee.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=u.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 { 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 { getCurrentTimeInSeconds as ne } from "../utils/time.utils.mjs";
+import { ExternalActionId as re } from "../../types/external-action.types.mjs";
+import { Logger as ie } from "../../error-handling/logger.mjs";
+import { takeOffHighestBit as ae } from "../utils/bit.operations.mjs";
+import { buildOutCommitments as oe, calcAmountChanges as a, calcEncryptedOutputs as se, calcPublicSignalCount as o, calcStealthAddressStructure as s, createCallDataHash as c, getSlippageValues as l, getUtxoCircuitH0Coords as u, getUtxoCircuitInRandomization as ce, getZkProofVerifierName as le } from "./common.snarkjs.mjs";
+import { computeSignedMessageHashEvm as ue } from "./signedMessageHash.mjs";
+import { generateCircomData as de } from "./generateCircomData.mjs";
+import { AccountActions as fe } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { createHinkalTiming as pe } from "../utils/hinkalTiming.utils.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 = pe("constructZkProof"), k = le(m, h), A = a(m, h), j = m.map((e) => e[0].erc20TokenAddress), M = se(h), N = ee, P = g.getShieldedPrivateKey(), { pubSpendingBJJPoint: F } = g.getSpendingKeyPair(), I = s(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 = oe(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) => ce(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: ae(I.extraRandomization),
+		H0Ay: I.H0
+	}, K = o(k, G.erc20TokenAddresses, G.amountChanges, G.inNullifiers, G.outCommitments), q = a(m, h, !0), J = l(q);
+	ie.log({ publicSignalCount: K });
+	let Y = Array.isArray(y) ? y : [y], he = t(C), ge = D ? fe.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 = c(K, S, v, _, X, M, T, J, w, x, N, E);
+	let Z = ue({
+		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 = de(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;

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

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

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

@@ -1 +1 @@
-const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{if(c)try{let t=e.getCustomProofGenerator();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;
+const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`../utils/hinkalTiming.utils.cjs`),r=require(`./getZKFiles.cjs`),i=require(`./generateZkProofEnclave.cjs`),a=require(`./generateZkProofSelf.cjs`);var o=async(o,s,c,l)=>{let u=n.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){t.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;

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

@@ -1,20 +1,31 @@
 import { getCustomProofGenerator as e } from "../utils/customEnclaveFunctionsRegister.mjs";
 import { Logger as t } from "../../error-handling/logger.mjs";
-import { getWASMFile as n, getZKeyFile as r } from "./getZKFiles.mjs";
-import { generateZkProofEnclave as i } from "./generateZkProofEnclave.mjs";
-import { generateZkProofSelf as a } from "./generateZkProofSelf.mjs";
+import { createHinkalTiming as n } from "../utils/hinkalTiming.utils.mjs";
+import { getWASMFile as r, getZKeyFile as i } from "./getZKFiles.mjs";
+import { generateZkProofEnclave as a } from "./generateZkProofEnclave.mjs";
+import { generateZkProofSelf as o } from "./generateZkProofSelf.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProof.ts
-var o = async (o, s, c, l) => {
-	if (l) try {
+var s = async (s, c, l, u) => {
+	let d = n("generateZkProof");
+	if (d.log("start", {
+		remotely: !!u,
+		verifierNames: c
+	}), u) try {
 		let t = e();
-		return t ? (await t(c, s.map((e) => n(e, o)), s.map((e) => r(e, o)))).map(({ zkCallData: e, publicSignals: t }) => ({
-			zkCallData: e,
-			publicSignals: t
-		})) : await i(o, s, c);
+		if (t) {
+			let e = await t(l, c.map((e) => r(e, s)), c.map((e) => i(e, s)));
+			return d.log("customProofGenerator", { verifierNames: c }), e.map(({ zkCallData: e, publicSignals: t }) => ({
+				zkCallData: e,
+				publicSignals: t
+			}));
+		}
+		let n = await a(s, c, l);
+		return d.log("enclave", { verifierNames: c }), n;
 	} catch (e) {
-		t.error("enclave proof error", e);
+		t.error("enclave proof error", e), d.log("enclave-failed-fallback-self");
 	}
-	return Promise.all(s.map((e, t) => a(o, e, c[t])));
+	let f = await Promise.all(c.map((e, t) => o(s, e, l[t])));
+	return d.log("self", { verifierNames: c }), f;
 };
 //#endregion
-export { o as generateZkProof };
+export { s as generateZkProof };

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

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

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

@@ -2,26 +2,29 @@ import { ENCLAVE_URL as e } from "./constant.mjs";
 import { httpClient as t } from "../../data-structures/http/HttpClient.mjs";
 import "../../data-structures/http/index.mjs";
 import { makeEnclaveHandshakeAndEncryptInput as n } from "../utils/encryptInputForEnclave.mjs";
-import { getWASMFile as r, getZKeyFile as i } from "./getZKFiles.mjs";
+import { createHinkalTiming as r } from "../utils/hinkalTiming.utils.mjs";
+import { getWASMFile as i, getZKeyFile as a } from "./getZKFiles.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProofEnclave.ts
-var a = (e) => {
+var o = (e) => {
 	if (e.startsWith("http")) {
 		let t = e.split("/").at(-1);
 		if (!t) throw Error("invalid verifierName");
 		return t;
 	}
 	return e;
-}, o = async (o, s, c) => {
-	let l = s.map((e) => a(r(e, o))), u = s.map((e) => a(i(e, o))), { keyCiphertext: d, inputCiphertext: f } = await n(c), p = {
-		circuit_wasms: l,
-		circuit_zkeys: u,
-		inputs: f,
-		key: d
-	};
-	return (await t.post(`${e}/generate-proofs`, p)).map(({ zk_calldata: e, public_signals: t }) => ({
+}, s = async (s, c, l) => {
+	let u = r("generateZkProofEnclave"), d = c.map((e) => o(i(e, s))), f = c.map((e) => o(a(e, s))), { keyCiphertext: p, inputCiphertext: m } = await n(l);
+	u.log("handshake+encrypt", { verifierNames: c });
+	let h = {
+		circuit_wasms: d,
+		circuit_zkeys: f,
+		inputs: m,
+		key: p
+	}, g = await t.post(`${e}/generate-proofs`, h);
+	return u.log("enclave-http", { verifierNames: c }), g.map(({ zk_calldata: e, public_signals: t }) => ({
 		zkCallData: e,
 		publicSignals: t
 	}));
 };
 //#endregion
-export { o as generateZkProofEnclave };
+export { s as generateZkProofEnclave };

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

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

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

@@ -1,25 +1,31 @@
 import { WorkerVariant as e } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as t } from "../../webworker/performTaskWithWorker.mjs";
-import { getWASMFile as n, getZKeyFile as r } from "./getZKFiles.mjs";
-import { SnarkJSWorkerActionType as i } from "../../webworker/snarkjsWorker/snarkjsWorker.types.mjs";
+import { createHinkalTiming as t } from "../utils/hinkalTiming.utils.mjs";
+import { performTaskWithWorker as n } from "../../webworker/performTaskWithWorker.mjs";
+import { getWASMFile as r, getZKeyFile as i } from "./getZKFiles.mjs";
+import { SnarkJSWorkerActionType as a } from "../../webworker/snarkjsWorker/snarkjsWorker.types.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProofSelf.ts
-var a = async (a, o, s) => {
-	let c = n(o, a), l = r(o, a), { publicSignals: u, zkCallData: d } = await t({
+var o = async (o, s, c) => {
+	let l = t(`generateZkProofSelf:${s}`), u = r(s, o), d = i(s, o);
+	l.log("start", {
+		chainId: o,
+		wasmFilePath: u
+	});
+	let { publicSignals: f, zkCallData: p } = await n({
 		type: e.SnarkJS,
 		payload: {
-			type: i.FULL_PROVE,
+			type: a.FULL_PROVE,
 			data: {
-				input: s,
-				chainId: a,
-				wasmFilePath: c,
-				zKeyFilePath: l
+				input: c,
+				chainId: o,
+				wasmFilePath: u,
+				zKeyFilePath: d
 			}
 		}
 	});
-	return {
-		zkCallData: d,
-		publicSignals: u
+	return l.log("worker-done"), {
+		zkCallData: p,
+		publicSignals: f
 	};
 };
 //#endregion
-export { a as generateZkProofSelf };
+export { o as generateZkProofSelf };

package/common/src/functions/utils/hinkalTiming.utils.cjs

@@ -0,0 +1 @@
+var e=`[HinkalTiming]`,t=(t,n,r,i)=>{let a=Date.now(),o=a-r.last,s=a-r.start;r.last=a;let c=i?` ${JSON.stringify(i)}`:``;console.log(`${e} [${t}] ${n} +${o}ms (total ${s}ms)${c}`)},n=e=>{let n={start:Date.now(),last:Date.now()};return{marks:n,log:(r,i)=>t(e,r,n,i)}};exports.createHinkalTiming=n;

package/common/src/functions/utils/hinkalTiming.utils.mjs

@@ -0,0 +1,18 @@
+//#region libs/shared/common/src/functions/utils/hinkalTiming.utils.ts
+var e = "[HinkalTiming]", t = (t, n, r, i) => {
+	let a = Date.now(), o = a - r.last, s = a - r.start;
+	r.last = a;
+	let c = i ? ` ${JSON.stringify(i)}` : "";
+	console.log(`${e} [${t}] ${n} +${o}ms (total ${s}ms)${c}`);
+}, n = (e) => {
+	let n = {
+		start: Date.now(),
+		last: Date.now()
+	};
+	return {
+		marks: n,
+		log: (r, i) => t(e, r, n, i)
+	};
+};
+//#endregion
+export { n as createHinkalTiming };

package/common/src/webworker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gurge/sdk",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"

package/common/src/webworker/performTaskWithWorker.cjs

@@ -1 +1 @@
-const e=require(`../constants/vite.constants.cjs`),t=require(`../constants/chains.constants.cjs`),n=require(`./workerFactory.cjs`);var r=async r=>{let i=await n.WorkerFactory.getWebWorker(r.type);return new Promise((n,a)=>{let o={};if(typeof window<`u`&&window.location){let{origin:e,protocol:t,host:n,port:r,hostname:i,href:a}=window.location;o={origin:e,protocol:t,host:n,port:r,hostname:i,href:a}}i.onMessage(e=>{n(e),i.terminate()}),i.onError(e=>{a(e),i.terminate()});let s={payload:r.payload,metadata:{hostLocation:o,constants:{chains:{chainIds:t.chainIds},isDevelopment:e.isDevelopment}}};i.postMessage(s)})};exports.performTaskWithWorker=r;
+const e=require(`../constants/vite.constants.cjs`),t=require(`../constants/chains.constants.cjs`),n=require(`./workerFactory.cjs`),r=require(`../functions/utils/hinkalTiming.utils.cjs`);var i=async i=>{let a=r.createHinkalTiming(`worker:${i.type}`),o=await n.WorkerFactory.getWebWorker(i.type);return a.log(`spawned`),new Promise((n,r)=>{let s={};if(typeof window<`u`&&window.location){let{origin:e,protocol:t,host:n,port:r,hostname:i,href:a}=window.location;s={origin:e,protocol:t,host:n,port:r,hostname:i,href:a}}o.onMessage(e=>{a.log(`completed`),n(e),o.terminate()}),o.onError(e=>{a.log(`error`),r(e),o.terminate()});let c={payload:i.payload,metadata:{hostLocation:s,constants:{chains:{chainIds:t.chainIds},isDevelopment:e.isDevelopment}}};o.postMessage(c)})};exports.performTaskWithWorker=i;

package/common/src/webworker/performTaskWithWorker.mjs

@@ -1,14 +1,15 @@
 import { isDevelopment as e } from "../constants/vite.constants.mjs";
 import { chainIds as t } from "../constants/chains.constants.mjs";
 import { WorkerFactory as n } from "./workerFactory.mjs";
+import { createHinkalTiming as r } from "../functions/utils/hinkalTiming.utils.mjs";
 //#region libs/shared/common/src/webworker/performTaskWithWorker.ts
-var r = async (r) => {
-	let i = await n.getWebWorker(r.type);
-	return new Promise((n, a) => {
-		let o = {};
+var i = async (i) => {
+	let a = r(`worker:${i.type}`), o = await n.getWebWorker(i.type);
+	return a.log("spawned"), new Promise((n, r) => {
+		let s = {};
 		if (typeof window < "u" && window.location) {
 			let { origin: e, protocol: t, host: n, port: r, hostname: i, href: a } = window.location;
-			o = {
+			s = {
 				origin: e,
 				protocol: t,
 				host: n,
@@ -17,23 +18,23 @@ var r = async (r) => {
 				href: a
 			};
 		}
-		i.onMessage((e) => {
-			n(e), i.terminate();
-		}), i.onError((e) => {
-			a(e), i.terminate();
+		o.onMessage((e) => {
+			a.log("completed"), n(e), o.terminate();
+		}), o.onError((e) => {
+			a.log("error"), r(e), o.terminate();
 		});
-		let s = {
-			payload: r.payload,
+		let c = {
+			payload: i.payload,
 			metadata: {
-				hostLocation: o,
+				hostLocation: s,
 				constants: {
 					chains: { chainIds: t },
 					isDevelopment: e
 				}
 			}
 		};
-		i.postMessage(s);
+		o.postMessage(c);
 	});
 };
 //#endregion
-export { r as performTaskWithWorker };
+export { i as performTaskWithWorker };

package/common/src/webworker/viteWorkerURL.constant.cjs

@@ -14,8 +14,8 @@
   var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
 
   const n = async () => ({
-    [e.ZKProof]: await getWorkerURL(domain + '/0.3.22/' + 'zkProofWorkerLauncher.js'),
-    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.22/' + 'snarkjsWorkerLauncher.js'),
-    [e.UTXO]: await getWorkerURL(domain + '/0.3.22/' + 'utxoWorkerLauncher.js'),
+    [e.ZKProof]: await getWorkerURL(domain + '/0.3.23/' + 'zkProofWorkerLauncher.js'),
+    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.23/' + 'snarkjsWorkerLauncher.js'),
+    [e.UTXO]: await getWorkerURL(domain + '/0.3.23/' + 'utxoWorkerLauncher.js'),
   });
   exports.getWorkerViteURL = n;

package/common/src/webworker/viteWorkerURL.constant.mjs

@@ -14,8 +14,8 @@
   var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
 
   const n = async () => ({
-    [e.ZKProof]: await getWorkerURL(domain + '/0.3.22/' + 'zkProofWorkerLauncher.js'),
-    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.22/' + 'snarkjsWorkerLauncher.js'),
-    [e.UTXO]: await getWorkerURL(domain + '/0.3.22/' + 'utxoWorkerLauncher.js'),
+    [e.ZKProof]: await getWorkerURL(domain + '/0.3.23/' + 'zkProofWorkerLauncher.js'),
+    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.23/' + 'snarkjsWorkerLauncher.js'),
+    [e.UTXO]: await getWorkerURL(domain + '/0.3.23/' + 'utxoWorkerLauncher.js'),
   });
   export { n as getWorkerViteURL };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gurge/sdk",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"

package/sdk/package.json.cjs

@@ -1 +1 @@
-var e={name:`@gurge/sdk`,version:`0.3.21`,homepage:`hinkal.io`,author:{name:`Hinkal Protocol`},keywords:[`blockchain`,`privacy`,`zero-knowledge`,`stealth addresses`],exports:{".":{types:`./index.d.ts`,"react-native":`./index.cjs`,import:`./index.mjs`,default:`./index.cjs`},"./providers/WagmiProviderAdapter":{types:`./providers/WagmiProviderAdapter.d.ts`,"react-native":`./providers/WagmiProviderAdapter.cjs`,import:`./providers/WagmiProviderAdapter.mjs`,default:`./providers/WagmiProviderAdapter.cjs`},"./providers/EthersProviderAdapter":{types:`./providers/EthersProviderAdapter.d.ts`,"react-native":`./providers/EthersProviderAdapter.cjs`,import:`./providers/EthersProviderAdapter.mjs`,default:`./providers/EthersProviderAdapter.cjs`},"./providers/TronProviderAdapter":{types:`./providers/TronProviderAdapter.d.ts`,"react-native":`./providers/TronProviderAdapter.cjs`,import:`./providers/TronProviderAdapter.mjs`,default:`./providers/TronProviderAdapter.cjs`},"./providers/SolanaProviderAdapter":{types:`./providers/SolanaProviderAdapter.d.ts`,"react-native":`./providers/SolanaProviderAdapter.cjs`,import:`./providers/SolanaProviderAdapter.mjs`,default:`./providers/SolanaProviderAdapter.cjs`},"./providers/prepareEthersHinkal":{types:`./providers/prepareEthersHinkal.d.ts`,"react-native":`./providers/prepareEthersHinkal.cjs`,import:`./providers/prepareEthersHinkal.mjs`,default:`./providers/prepareEthersHinkal.cjs`},"./providers/prepareWagmiHinkal":{types:`./providers/prepareWagmiHinkal.d.ts`,"react-native":`./providers/prepareWagmiHinkal.cjs`,import:`./providers/prepareWagmiHinkal.mjs`,default:`./providers/prepareWagmiHinkal.cjs`},"./providers/prepareTronHinkal":{types:`./providers/prepareTronHinkal.d.ts`,"react-native":`./providers/prepareTronHinkal.cjs`,import:`./providers/prepareTronHinkal.mjs`,default:`./providers/prepareTronHinkal.cjs`},"./providers/prepareSolanaHinkal":{types:`./providers/prepareSolanaHinkal.d.ts`,"react-native":`./providers/prepareSolanaHinkal.cjs`,import:`./providers/prepareSolanaHinkal.mjs`,default:`./providers/prepareSolanaHinkal.cjs`},"./react-native/HinkalWebViewWorker":{types:`./react-native/HinkalWebViewWorker.d.ts`,"react-native":`./react-native/HinkalWebViewWorker.cjs`,import:`./react-native/HinkalWebViewWorker.mjs`,default:`./react-native/HinkalWebViewWorker.cjs`},"./react-native/metro-config":`./react-native/metro-config.js`,"./react-native/shims/*":`./react-native/shims/*`},types:`./index.d.ts`,scripts:{prebuild:`nx prebuild:workers`,build:`nx build`,lint:`nx lint`,test:`nx test`},devDependencies:{nx:`22.6.4`,vite:`^8.0.4`,"vite-plugin-dts":`^4.5.4`,"vite-tsconfig-paths":`^6.1.1`},dependencies:{"@coral-xyz/anchor":`^0.31.0`,"@solana/spl-token":`^0.4.14`,"@solana/web3.js":`^1.98.4`,"@solana/wallet-adapter-react":`^0.15.39`,axios:`^1.15.0`,"async-mutex":`^0.4.0`,bs58:`^6.0.0`,buffer:`6.0.3`,"circomlibjs-hinkal-fork":`^0.0.10`,dotenv:`^16.4.5`,ethers:`^6.15.0`,"idb-keyval":`6.2.1`,multiformats:`^9.4.2`,snarkjs:`0.7.5`,"libsodium-wrappers":`^0.8.2`,lodash:`^4.17.21`,tweetnacl:`^1.0.3`,process:`0.11.10`,"ua-parser-js":`^1.0.37`,uuid:`^9.0.1`,"node-forge":`^1.3.1`,"poseidon-lite":`^0.3.0`,tronweb:`^6.2.0`},peerDependencies:{wagmi:`2.13.3`,"@walletconnect/utils":`^2.17.2`,react:`*`,"react-native":`*`,"react-native-webview":`*`},peerDependenciesMeta:{wagmi:{optional:!0},"@walletconnect/utils":{optional:!0},react:{optional:!0},"react-native":{optional:!0},"react-native-webview":{optional:!0}}};exports.default=e;
+var e={name:`@gurge/sdk`,version:`0.3.22`,homepage:`hinkal.io`,author:{name:`Hinkal Protocol`},keywords:[`blockchain`,`privacy`,`zero-knowledge`,`stealth addresses`],exports:{".":{types:`./index.d.ts`,"react-native":`./index.cjs`,import:`./index.mjs`,default:`./index.cjs`},"./providers/WagmiProviderAdapter":{types:`./providers/WagmiProviderAdapter.d.ts`,"react-native":`./providers/WagmiProviderAdapter.cjs`,import:`./providers/WagmiProviderAdapter.mjs`,default:`./providers/WagmiProviderAdapter.cjs`},"./providers/EthersProviderAdapter":{types:`./providers/EthersProviderAdapter.d.ts`,"react-native":`./providers/EthersProviderAdapter.cjs`,import:`./providers/EthersProviderAdapter.mjs`,default:`./providers/EthersProviderAdapter.cjs`},"./providers/TronProviderAdapter":{types:`./providers/TronProviderAdapter.d.ts`,"react-native":`./providers/TronProviderAdapter.cjs`,import:`./providers/TronProviderAdapter.mjs`,default:`./providers/TronProviderAdapter.cjs`},"./providers/SolanaProviderAdapter":{types:`./providers/SolanaProviderAdapter.d.ts`,"react-native":`./providers/SolanaProviderAdapter.cjs`,import:`./providers/SolanaProviderAdapter.mjs`,default:`./providers/SolanaProviderAdapter.cjs`},"./providers/prepareEthersHinkal":{types:`./providers/prepareEthersHinkal.d.ts`,"react-native":`./providers/prepareEthersHinkal.cjs`,import:`./providers/prepareEthersHinkal.mjs`,default:`./providers/prepareEthersHinkal.cjs`},"./providers/prepareWagmiHinkal":{types:`./providers/prepareWagmiHinkal.d.ts`,"react-native":`./providers/prepareWagmiHinkal.cjs`,import:`./providers/prepareWagmiHinkal.mjs`,default:`./providers/prepareWagmiHinkal.cjs`},"./providers/prepareTronHinkal":{types:`./providers/prepareTronHinkal.d.ts`,"react-native":`./providers/prepareTronHinkal.cjs`,import:`./providers/prepareTronHinkal.mjs`,default:`./providers/prepareTronHinkal.cjs`},"./providers/prepareSolanaHinkal":{types:`./providers/prepareSolanaHinkal.d.ts`,"react-native":`./providers/prepareSolanaHinkal.cjs`,import:`./providers/prepareSolanaHinkal.mjs`,default:`./providers/prepareSolanaHinkal.cjs`},"./react-native/HinkalWebViewWorker":{types:`./react-native/HinkalWebViewWorker.d.ts`,"react-native":`./react-native/HinkalWebViewWorker.cjs`,import:`./react-native/HinkalWebViewWorker.mjs`,default:`./react-native/HinkalWebViewWorker.cjs`},"./react-native/metro-config":`./react-native/metro-config.js`,"./react-native/shims/*":`./react-native/shims/*`},types:`./index.d.ts`,scripts:{prebuild:`nx prebuild:workers`,build:`nx build`,lint:`nx lint`,test:`nx test`},devDependencies:{nx:`22.6.4`,vite:`^8.0.4`,"vite-plugin-dts":`^4.5.4`,"vite-tsconfig-paths":`^6.1.1`},dependencies:{"@coral-xyz/anchor":`^0.31.0`,"@solana/spl-token":`^0.4.14`,"@solana/web3.js":`^1.98.4`,"@solana/wallet-adapter-react":`^0.15.39`,axios:`^1.15.0`,"async-mutex":`^0.4.0`,bs58:`^6.0.0`,buffer:`6.0.3`,"circomlibjs-hinkal-fork":`^0.0.10`,dotenv:`^16.4.5`,ethers:`^6.15.0`,"idb-keyval":`6.2.1`,multiformats:`^9.4.2`,snarkjs:`0.7.5`,"libsodium-wrappers":`^0.8.2`,lodash:`^4.17.21`,tweetnacl:`^1.0.3`,process:`0.11.10`,"ua-parser-js":`^1.0.37`,uuid:`^9.0.1`,"node-forge":`^1.3.1`,"poseidon-lite":`^0.3.0`,tronweb:`^6.2.0`},peerDependencies:{wagmi:`2.13.3`,"@walletconnect/utils":`^2.17.2`,react:`*`,"react-native":`*`,"react-native-webview":`*`},peerDependenciesMeta:{wagmi:{optional:!0},"@walletconnect/utils":{optional:!0},react:{optional:!0},"react-native":{optional:!0},"react-native-webview":{optional:!0}}};exports.default=e;

package/sdk/package.json.mjs

@@ -1,6 +1,6 @@
 var e = {
 	name: "@gurge/sdk",
-	version: "0.3.21",
+	version: "0.3.22",
 	homepage: "hinkal.io",
 	author: { name: "Hinkal Protocol" },
 	keywords: [